diff --git a/LibreNMS/DB/SyncsModels.php b/LibreNMS/DB/SyncsModels.php index 7b3f59834e..0a01a95619 100644 --- a/LibreNMS/DB/SyncsModels.php +++ b/LibreNMS/DB/SyncsModels.php @@ -25,8 +25,11 @@ namespace LibreNMS\DB; +use App\Models\Device; +use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\HasManyThrough; use Illuminate\Support\Collection; +use LibreNMS\Interfaces\Models\Keyable; trait SyncsModels { @@ -36,13 +39,13 @@ trait SyncsModels * * @param \App\Models\Device $device * @param string $relationship - * @param \Illuminate\Support\Collection $models \LibreNMS\Interfaces\Models\Keyable + * @param \Illuminate\Support\Collection $models \LibreNMS\Interfaces\Models\Keyable * @return \Illuminate\Support\Collection */ - protected function syncModels($device, $relationship, $models): Collection + protected function syncModels($device, $relationship, $models, $existing = null): Collection { $models = $models->keyBy->getCompositeKey(); - $existing = $device->$relationship->groupBy->getCompositeKey(); + $existing = ($existing ?? $device->$relationship)->groupBy->getCompositeKey(); foreach ($existing as $exist_key => $existing_rows) { if ($models->offsetExists($exist_key)) { @@ -75,6 +78,24 @@ trait SyncsModels return $existing->map->first()->merge($new); } + /** + * Sync a sub-group of models to the database + * + * @param Collection $models + */ + public function syncModelsByGroup(Device $device, string $relationship, Collection $models, array $where): Collection + { + $filter = function ($models, $params) { + foreach ($params as $key => $value) { + $models = $models->where($key, '=', $value); + } + + return $models; + }; + + return $this->syncModels($device, $relationship, $models->when($where, $filter), $device->$relationship->when($where, $filter)); + } + /** * Combine a list of existing and potentially new models * If the model exists fill any new data from the new models diff --git a/app/Discovery/Sensor.php b/app/Discovery/Sensor.php new file mode 100644 index 0000000000..b2fbc3a9e4 --- /dev/null +++ b/app/Discovery/Sensor.php @@ -0,0 +1,79 @@ +. + * + * @link https://www.librenms.org + * + * @copyright 2024 Tony Murray + * @author Tony Murray + */ + +namespace App\Discovery; + +use App\Models\Device; +use Illuminate\Support\Collection; +use LibreNMS\DB\SyncsModels; + +class Sensor +{ + use SyncsModels; + + private Collection $models; + /** @var bool[] */ + private array $discovered = []; + private string $relationship = 'sensors'; + private Device $device; + + public function __construct(Device $device) + { + $this->device = $device; + $this->models = new Collection; + } + + public function discover(\App\Models\Sensor $sensor): static + { + $this->models->push($sensor); + $this->discovered[$sensor->syncGroup()] = false; + + return $this; + } + + public function isDiscovered(string $type): bool + { + return $this->discovered[$type] ?? false; + } + + public function sync(...$params): Collection + { + $type = implode('-', $params); + + if (! $this->isDiscovered($type)) { + $synced = $this->syncModelsByGroup($this->device, 'sensors', $this->getModels(), $params); + $this->discovered[$type] = true; + + return $synced; + } + + return new Collection; + } + + public function getModels(): Collection + { + return $this->models; + } +} diff --git a/app/Models/Sensor.php b/app/Models/Sensor.php index 04fd3bb6e7..85225d15cf 100644 --- a/app/Models/Sensor.php +++ b/app/Models/Sensor.php @@ -5,13 +5,35 @@ namespace App\Models; use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Relations\BelongsToMany; use Illuminate\Database\Eloquent\Relations\MorphMany; +use LibreNMS\Interfaces\Models\Keyable; -class Sensor extends DeviceRelatedModel +class Sensor extends DeviceRelatedModel implements Keyable { use HasFactory; public $timestamps = false; protected $primaryKey = 'sensor_id'; + protected $fillable = [ + 'poller_type', + 'sensor_class', + 'device_id', + 'sensor_oid', + 'sensor_index', + 'sensor_type', + 'sensor_descr', + 'sensor_divisor', + 'sensor_multiplier', + 'sensor_limit', + 'sensor_limit_warn', + 'sensor_limit_low', + 'sensor_limit_low_warn', + 'sensor_current', + 'entPhysicalIndex', + 'entPhysicalIndex_measured', + 'user_func', + 'group', + 'rrd_type', + ]; protected static $icons = [ 'airflow' => 'angle-double-right', 'ber' => 'sort-amount-desc', @@ -75,6 +97,32 @@ class Sensor extends DeviceRelatedModel return self::$icons; } + public function guessLimits(): void + { + $this->sensor_limit = match ($this->sensor_class) { + 'temperature' => $this->sensor_current - 10, + 'voltage' => $this->sensor_current * 0.85, + 'humidity' => 30, + 'fanspeed' => $this->sensor_current * 0.80, + 'power_factor' => -1, + 'signal' => -80, + 'airflow', 'snr', 'frequency', 'pressure', 'cooling' => $this->sensor_current * 0.95, + default => null, + }; + + $this->sensor_limit_low = match ($this->sensor_class) { + 'temperature' => $this->sensor_current + 20, + 'voltage' => $this->sensor_current * 1.15, + 'humidity' => 70, + 'fanspeed' => $this->sensor_current * 1.80, + 'power_factor' => 1, + 'signal' => -30, + 'load' => 80, + 'airflow', 'snr', 'frequency', 'pressure', 'cooling' => $this->sensor_current * 1.05, + default => null, + }; + } + // ---- Define Relationships ---- public function events(): MorphMany { @@ -85,4 +133,14 @@ class Sensor extends DeviceRelatedModel { return $this->belongsToMany(StateTranslation::class, 'sensors_to_state_indexes', 'sensor_id', 'state_index_id'); } + + public function getCompositeKey(): string + { + return "$this->poller_type-$this->sensor_class-$this->device_id-$this->sensor_type-$this->sensor_index"; + } + + public function syncGroup(): string + { + return "$this->sensor_class-$this->poller_type"; + } } diff --git a/app/Observers/SensorObserver.php b/app/Observers/SensorObserver.php new file mode 100644 index 0000000000..7fb0487e96 --- /dev/null +++ b/app/Observers/SensorObserver.php @@ -0,0 +1,121 @@ +runningInConsole = $app->runningInConsole(); + } + + public function saving(Sensor $sensor): void + { + // fix inverted limits + if ($sensor->sensor_limit !== null && $sensor->sensor_limit_low !== null && $sensor->sensor_limit_low > $sensor->sensor_limit) { + // Fix high/low thresholds (i.e. on negative numbers) + [$sensor->sensor_limit, $sensor->sensor_limit_low] = [$sensor->sensor_limit_low, $sensor->sensor_limit]; + } + + if ($this->runningInConsole && ! $sensor->isDirty()) { + echo '.'; + } + } + + /** + * Handle the service "created" event. + * + * @param Sensor $sensor + * @return void + */ + public function created(Sensor $sensor): void + { + $guess_limits = \LibreNMS\Config::get('sensors.guess_limits', true); + if ($guess_limits && $sensor->sensor_current !== null && $sensor->sensor_limit === null && $sensor->sensor_limit_low === null) { + $sensor->guessLimits(); + } + + EventLog::log('Sensor Added: ' . $sensor->sensor_class . ' ' . $sensor->sensor_type . ' ' . $sensor->sensor_index . ' ' . $sensor->sensor_descr, $sensor->device_id, 'sensor', Severity::Notice, $sensor->sensor_id); + + if ($this->runningInConsole) { + echo '+'; + } + } + + /** + * Handle the Stp "updating" event. + * + * @param \App\Models\Sensor $sensor + * @return void + */ + public function updating(Sensor $sensor) + { + // prevent update of limits + if ($sensor->sensor_custom !== 'Yes') { + if ($sensor->getOriginal('sensor_limit') !== null) { + $sensor->sensor_limit = $sensor->getOriginal('sensor_limit'); + } + if ($sensor->getOriginal('sensor_limit_low') !== null) { + $sensor->sensor_limit_low = $sensor->getOriginal('sensor_limit_low'); + } + } + } + + public function updated(Sensor $sensor): void + { + // log limit changes + if ($sensor->sensor_custom == 'No') { + if ($sensor->isDirty('sensor_limit')) { + EventLog::log('Sensor High Limit Updated: ' . $sensor->sensor_class . ' ' . $sensor->sensor_type . ' ' . $sensor->sensor_index . ' ' . $sensor->sensor_descr . ' (' . $sensor->sensor_limit . ')', $sensor->device_id, 'sensor', Severity::Notice, $sensor->sensor_id); + + if ($this->runningInConsole) { + echo 'H'; + } + } + + if ($sensor->isDirty('sensor_limit_low')) { + EventLog::log('Sensor Low Limit Updated: ' . $sensor->sensor_class . ' ' . $sensor->sensor_type . ' ' . $sensor->sensor_index . ' ' . $sensor->sensor_descr . ' (' . $sensor->sensor_limit_low . ')', $sensor->device_id, 'sensor', Severity::Notice, $sensor->sensor_id); + + if ($this->runningInConsole) { + echo 'L'; + } + } + + if ($sensor->isDirty('sensor_limit_warn')) { + EventLog::log('Sensor Warn High Limit Updated: ' . $sensor->sensor_class . ' ' . $sensor->sensor_type . ' ' . $sensor->sensor_index . ' ' . $sensor->sensor_descr . ' (' . $sensor->sensor_limit_warn . ')', $sensor->device_id, 'sensor', Severity::Notice, $sensor->sensor_id); + + if ($this->runningInConsole) { + echo 'WH'; + } + } + + if ($sensor->isDirty('sensor_limit_low_warn')) { + EventLog::log('Sensor Warn Low Limit Updated: ' . $sensor->sensor_class . ' ' . $sensor->sensor_type . ' ' . $sensor->sensor_index . ' ' . $sensor->sensor_descr . ' (' . $sensor->sensor_limit_low_warn . ')', $sensor->device_id, 'sensor', Severity::Notice, $sensor->sensor_id); + + if ($this->runningInConsole) { + echo 'WL'; + } + } + } + + if ($this->runningInConsole) { + echo 'U'; + } + + EventLog::log('Sensor Updated: ' . $sensor->sensor_class . ' ' . $sensor->sensor_type . ' ' . $sensor->sensor_index . ' ' . $sensor->sensor_descr, $sensor->device_id, 'sensor', Severity::Notice, $sensor->sensor_id); + } + + public function deleted(): void + { + if ($this->runningInConsole) { + echo '-'; + } + } +} diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index 8f8919f9ae..ebf95f2201 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -3,6 +3,7 @@ namespace App\Providers; use App\Models\Sensor; +use Illuminate\Contracts\Foundation\Application; use Illuminate\Database\Eloquent\Relations\Relation; use Illuminate\Support\Facades\Blade; use Illuminate\Support\Facades\Log; @@ -25,22 +26,26 @@ class AppServiceProvider extends ServiceProvider $this->registerFacades(); $this->registerGeocoder(); - $this->app->singleton('permissions', function ($app) { + $this->app->singleton('permissions', function () { return new PermissionsCache(); }); - $this->app->singleton('device-cache', function ($app) { + $this->app->singleton('device-cache', function () { return new \LibreNMS\Cache\Device(); }); - $this->app->singleton('git', function ($app) { + $this->app->singleton('git', function () { return new \LibreNMS\Util\Git(); }); - $this->app->bind(\App\Models\Device::class, function () { + $this->app->bind(\App\Models\Device::class, function (Application $app) { /** @var \LibreNMS\Cache\Device $cache */ - $cache = $this->app->make('device-cache'); + $cache = $app->make('device-cache'); return $cache->hasPrimary() ? $cache->getPrimary() : new \App\Models\Device; }); + + $this->app->singleton('sensor-discovery', function (Application $app) { + return new \App\Discovery\Sensor($app->make('device-cache')->getPrimary()); + }); } /** @@ -137,6 +142,7 @@ class AppServiceProvider extends ServiceProvider { \App\Models\Device::observe(\App\Observers\DeviceObserver::class); \App\Models\Package::observe(\App\Observers\PackageObserver::class); + \App\Models\Sensor::observe(\App\Observers\SensorObserver::class); \App\Models\Service::observe(\App\Observers\ServiceObserver::class); \App\Models\Stp::observe(\App\Observers\StpObserver::class); \App\Models\User::observe(\App\Observers\UserObserver::class); diff --git a/discovery.php b/discovery.php index 54e029e468..c90a29e1f2 100755 --- a/discovery.php +++ b/discovery.php @@ -105,6 +105,7 @@ global $device; foreach (dbFetchRows("SELECT * FROM `devices` WHERE disabled = 0 $where ORDER BY device_id DESC", $sqlparams) as $device) { $device_start = microtime(true); DeviceCache::setPrimary($device['device_id']); + App::forgetInstance('sensor-discovery'); if (discover_device($device, $module_override)) { $discovered_devices++; diff --git a/doc/Developing/Sensor-State-Support.md b/doc/Developing/Sensor-State-Support.md index dc34e2f0c5..1d861d3a26 100644 --- a/doc/Developing/Sensor-State-Support.md +++ b/doc/Developing/Sensor-State-Support.md @@ -138,7 +138,7 @@ if (!empty($oids)) { $num_oid = '.1.3.6.1.4.1.9.9.13.1.5.1.3.'; foreach ($oids as $index => $entry) { //Discover Sensors - discover_sensor($valid['sensor'], 'state', $device, $num_oid.$index, $index, $state_name, $entry['ciscoEnvMonSupplyStatusDescr'], '1', '1', null, null, null, null, $entry['ciscoEnvMonSupplyState'], 'snmp', $index); + discover_sensor(null, 'state', $device, $num_oid.$index, $index, $state_name, $entry['ciscoEnvMonSupplyStatusDescr'], '1', '1', null, null, null, null, $entry['ciscoEnvMonSupplyState'], 'snmp', $index); //Create Sensor To State Index create_sensor_to_state_index($device, $state_name, $index); diff --git a/doc/Developing/os/Health-Information.md b/doc/Developing/os/Health-Information.md index 331933a928..786bbf710d 100644 --- a/doc/Developing/os/Health-Information.md +++ b/doc/Developing/os/Health-Information.md @@ -240,7 +240,7 @@ then passed to `discover_sensor()`. `discover_sensor()` Accepts the following arguments: -- &$valid = This is always $valid['sensor'], do not pass any other values. +- &$valid = This is always null. This is unused. - $class = Required. This is the sensor class from the table above (i.e humidity). - $device = Required. This is the $device array. - $oid = Required. This must be the numerical OID for where the data @@ -374,7 +374,7 @@ foreach ($pre_cache['adva_fsp150_ports'] as $index => $entry) { $descrRx = dbFetchCell('SELECT `ifName` FROM `ports` WHERE `ifIndex`= ? AND `device_id` = ?', [$entry['cmEthernetTrafficPortIfIndex'], $device['device_id']]) . ' Rx Power'; discover_sensor( - $valid['sensor'], + null, 'dbm', $device, $oidRx, @@ -396,7 +396,7 @@ foreach ($pre_cache['adva_fsp150_ports'] as $index => $entry) { $descrTx = dbFetchCell('SELECT `ifName` FROM `ports` WHERE `ifIndex`= ? AND `device_id` = ?', [$entry['cmEthernetTrafficPortIfIndex'], $device['device_id']]) . ' Tx Power'; discover_sensor( - $valid['sensor'], + null, 'dbm', $device, $oidTx, diff --git a/includes/discovery/functions.inc.php b/includes/discovery/functions.inc.php index 02082c32ed..c2fe81e50b 100644 --- a/includes/discovery/functions.inc.php +++ b/includes/discovery/functions.inc.php @@ -197,10 +197,8 @@ function discover_device(&$device, $force_module = false) //end discover_device() // Discover sensors -function discover_sensor(&$valid, $class, $device, $oid, $index, $type, $descr, $divisor = 1, $multiplier = 1, $low_limit = null, $low_warn_limit = null, $warn_limit = null, $high_limit = null, $current = null, $poller_type = 'snmp', $entPhysicalIndex = null, $entPhysicalIndex_measured = null, $user_func = null, $group = null, $rrd_type = 'GAUGE') +function discover_sensor($unused, $class, $device, $oid, $index, $type, $descr, $divisor = 1, $multiplier = 1, $low_limit = null, $low_warn_limit = null, $warn_limit = null, $high_limit = null, $current = null, $poller_type = 'snmp', $entPhysicalIndex = null, $entPhysicalIndex_measured = null, $user_func = null, $group = null, $rrd_type = 'GAUGE'): bool { - $guess_limits = Config::get('sensors.guess_limits', true); - $low_limit = set_null($low_limit); $low_warn_limit = set_null($low_warn_limit); $warn_limit = set_null($warn_limit); @@ -216,257 +214,31 @@ function discover_sensor(&$valid, $class, $device, $oid, $index, $type, $descr, d_echo("Discover sensor: $oid, $index, $type, $descr, $poller_type, $divisor, $multiplier, $entPhysicalIndex, $current, (limits: LL: $low_limit, LW: $low_warn_limit, W: $warn_limit, H: $high_limit), rrd_type = $rrd_type \n"); - if (isset($warn_limit, $low_warn_limit) && $low_warn_limit > $warn_limit) { - // Fix high/low thresholds (i.e. on negative numbers) - [$warn_limit, $low_warn_limit] = [$low_warn_limit, $warn_limit]; - } + app('sensor-discovery')->discover(new \App\Models\Sensor([ + 'poller_type' => $poller_type, + 'sensor_class' => $class, + 'device_id' => $device['device_id'], + 'sensor_oid' => $oid, + 'sensor_index' => $index, + 'sensor_type' => $type, + 'sensor_descr' => $descr, + 'sensor_divisor' => $divisor, + 'sensor_multiplier' => $multiplier, + 'sensor_limit' => $high_limit, + 'sensor_limit_warn' => $warn_limit, + 'sensor_limit_low' => $low_limit, + 'sensor_limit_low_warn' => $low_warn_limit, + 'sensor_current' => $current, + 'entPhysicalIndex' => $entPhysicalIndex, + 'entPhysicalIndex_measured' => $entPhysicalIndex_measured, + 'user_func' => $user_func, + 'group' => $group, + 'rrd_type' => $rrd_type, + ])); - if (dbFetchCell('SELECT COUNT(sensor_id) FROM `sensors` WHERE `poller_type`= ? AND `sensor_class` = ? AND `device_id` = ? AND sensor_type = ? AND `sensor_index` = ?', [$poller_type, $class, $device['device_id'], $type, (string) $index]) == '0') { - if ($guess_limits && is_null($high_limit)) { - $high_limit = sensor_limit($class, $current); - } - - if ($guess_limits && is_null($low_limit)) { - $low_limit = sensor_low_limit($class, $current); - } - - if (! is_null($high_limit) && $low_limit > $high_limit) { - // Fix high/low thresholds (i.e. on negative numbers) - [$high_limit, $low_limit] = [$low_limit, $high_limit]; - } - - $insert = [ - 'poller_type' => $poller_type, - 'sensor_class' => $class, - 'device_id' => $device['device_id'], - 'sensor_oid' => $oid, - 'sensor_index' => $index, - 'sensor_type' => $type, - 'sensor_descr' => $descr, - 'sensor_divisor' => $divisor, - 'sensor_multiplier' => $multiplier, - 'sensor_limit' => $high_limit, - 'sensor_limit_warn' => $warn_limit, - 'sensor_limit_low' => $low_limit, - 'sensor_limit_low_warn' => $low_warn_limit, - 'sensor_current' => $current, - 'entPhysicalIndex' => $entPhysicalIndex, - 'entPhysicalIndex_measured' => $entPhysicalIndex_measured, - 'user_func' => $user_func, - 'group' => $group, - 'rrd_type' => $rrd_type, - ]; - - $inserted = dbInsert($insert, 'sensors'); - - d_echo("( $inserted inserted )\n"); - - echo '+'; - log_event('Sensor Added: ' . $class . ' ' . $type . ' ' . $index . ' ' . $descr, $device, 'sensor', 3, $inserted); - } else { - $sensor_entry = dbFetchRow('SELECT * FROM `sensors` WHERE `sensor_class` = ? AND `device_id` = ? AND `sensor_type` = ? AND `sensor_index` = ?', [$class, $device['device_id'], $type, (string) $index]); - - if (! isset($high_limit)) { - if ($guess_limits && ! $sensor_entry['sensor_limit']) { - // Calculate a reasonable limit - $high_limit = sensor_limit($class, $current); - } else { - // Use existing limit - $high_limit = $sensor_entry['sensor_limit']; - } - } - - if (! isset($low_limit)) { - if ($guess_limits && ! $sensor_entry['sensor_limit_low']) { - // Calculate a reasonable limit - $low_limit = sensor_low_limit($class, $current); - } else { - // Use existing limit - $low_limit = $sensor_entry['sensor_limit_low']; - } - } - - // Fix high/low thresholds (i.e. on negative numbers) - if (isset($high_limit) && $low_limit > $high_limit) { - [$high_limit, $low_limit] = [$low_limit, $high_limit]; - } - - if ((string) $high_limit != (string) $sensor_entry['sensor_limit'] && $sensor_entry['sensor_custom'] == 'No') { - $update = ['sensor_limit' => $high_limit]; - $updated = dbUpdate($update, 'sensors', '`sensor_id` = ?', [$sensor_entry['sensor_id']]); - d_echo("( $updated updated )\n"); - - echo 'H'; - log_event('Sensor High Limit Updated: ' . $class . ' ' . $type . ' ' . $index . ' ' . $descr . ' (' . $high_limit . ')', $device, 'sensor', 3, $sensor_entry['sensor_id']); - } - - if ((string) $sensor_entry['sensor_limit_low'] != (string) $low_limit && $sensor_entry['sensor_custom'] == 'No') { - $update = ['sensor_limit_low' => $low_limit]; - $updated = dbUpdate($update, 'sensors', '`sensor_id` = ?', [$sensor_entry['sensor_id']]); - d_echo("( $updated updated )\n"); - - echo 'L'; - log_event('Sensor Low Limit Updated: ' . $class . ' ' . $type . ' ' . $index . ' ' . $descr . ' (' . $low_limit . ')', $device, 'sensor', 3, $sensor_entry['sensor_id']); - } - - if ((string) $warn_limit != (string) $sensor_entry['sensor_limit_warn'] && $sensor_entry['sensor_custom'] == 'No') { - $update = ['sensor_limit_warn' => $warn_limit]; - $updated = dbUpdate($update, 'sensors', '`sensor_id` = ?', [$sensor_entry['sensor_id']]); - d_echo("( $updated updated )\n"); - - echo 'WH'; - log_event('Sensor Warn High Limit Updated: ' . $class . ' ' . $type . ' ' . $index . ' ' . $descr . ' (' . $warn_limit . ')', $device, 'sensor', 3, $sensor_entry['sensor_id']); - } - - if ((string) $sensor_entry['sensor_limit_low_warn'] != (string) $low_warn_limit && $sensor_entry['sensor_custom'] == 'No') { - $update = ['sensor_limit_low_warn' => $low_warn_limit]; - $updated = dbUpdate($update, 'sensors', '`sensor_id` = ?', [$sensor_entry['sensor_id']]); - d_echo("( $updated updated )\n"); - - echo 'WL'; - log_event('Sensor Warn Low Limit Updated: ' . $class . ' ' . $type . ' ' . $index . ' ' . $descr . ' (' . $low_warn_limit . ')', $device, 'sensor', 3, $sensor_entry['sensor_id']); - } - - if ($oid == $sensor_entry['sensor_oid'] && - $descr == $sensor_entry['sensor_descr'] && - $multiplier == $sensor_entry['sensor_multiplier'] && - $divisor == $sensor_entry['sensor_divisor'] && - $entPhysicalIndex_measured == $sensor_entry['entPhysicalIndex_measured'] && - $entPhysicalIndex == $sensor_entry['entPhysicalIndex'] && - $user_func == $sensor_entry['user_func'] && - $group == $sensor_entry['group'] - - ) { - echo '.'; - } else { - $update = [ - 'sensor_oid' => $oid, - 'sensor_descr' => $descr, - 'sensor_multiplier' => $multiplier, - 'sensor_divisor' => $divisor, - 'entPhysicalIndex' => $entPhysicalIndex, - 'entPhysicalIndex_measured' => $entPhysicalIndex_measured, - 'user_func' => $user_func, - 'group' => $group, - ]; - $updated = dbUpdate($update, 'sensors', '`sensor_id` = ?', [$sensor_entry['sensor_id']]); - echo 'U'; - log_event('Sensor Updated: ' . $class . ' ' . $type . ' ' . $index . ' ' . $descr, $device, 'sensor', 3, $sensor_entry['sensor_id']); - d_echo("( $updated updated )\n"); - } - }//end if - $valid[$class][$type][$index] = 1; + return true; } -//end discover_sensor() - -function sensor_low_limit($class, $current) -{ - // matching an empty case executes code until a break is reached - switch ($class) { - case 'temperature': - $limit = $current - 10; - break; - case 'voltage': - $limit = $current * 0.85; - break; - case 'humidity': - $limit = 30; - break; - case 'fanspeed': - $limit = $current * 0.80; - break; - case 'power_factor': - $limit = -1; - break; - case 'signal': - $limit = -80; - break; - case 'airflow': - case 'snr': - case 'frequency': - case 'pressure': - case 'cooling': - $limit = $current * 0.95; - break; - default: - return null; - }//end switch - - return round($limit, 11); -} - -//end sensor_low_limit() - -function sensor_limit($class, $current) -{ - // matching an empty case executes code until a break is reached - switch ($class) { - case 'temperature': - $limit = $current + 20; - break; - case 'voltage': - $limit = $current * 1.15; - break; - case 'humidity': - $limit = 70; - break; - case 'fanspeed': - $limit = $current * 1.80; - break; - case 'power_factor': - $limit = 1; - break; - case 'signal': - $limit = -30; - break; - case 'load': - $limit = 80; - break; - case 'airflow': - case 'snr': - case 'frequency': - case 'pressure': - case 'cooling': - $limit = $current * 1.05; - break; - default: - return null; - }//end switch - - return round($limit, 11); -} - -//end sensor_limit() - -function check_valid_sensors($device, $class, $valid, $poller_type = 'snmp') -{ - $entries = dbFetchRows('SELECT * FROM sensors AS S, devices AS D WHERE S.sensor_class=? AND S.device_id = D.device_id AND D.device_id = ? AND S.poller_type = ?', [$class, $device['device_id'], $poller_type]); - - if (count($entries)) { - foreach ($entries as $entry) { - $index = $entry['sensor_index']; - $type = $entry['sensor_type']; - $class = $entry['sensor_class']; - d_echo($index . ' -> ' . $type . "\n"); - - if (! $valid[$class][$type][$index]) { - echo '-'; - if ($class == 'state') { - dbDelete('sensors_to_state_indexes', '`sensor_id` = ?', [$entry['sensor_id']]); - } - dbDelete('sensors', '`sensor_id` = ?', [$entry['sensor_id']]); - log_event('Sensor Deleted: ' . $entry['sensor_class'] . ' ' . $entry['sensor_type'] . ' ' . $entry['sensor_index'] . ' ' . $entry['sensor_descr'], $device, 'sensor', 3, $entry['sensor_id']); - } - - unset($oid); - unset($type); - } - } -} - -//end check_valid_sensors() - function discover_juniAtmVp(&$valid, $device, $port_id, $vp_id, $vp_descr) { d_echo("Discover Juniper ATM VP: $port_id, $vp_id, $vp_descr\n"); @@ -854,12 +626,11 @@ function ignore_storage($os, $descr) } /** - * @param $valid * @param OS $os * @param $sensor_type * @param $pre_cache */ -function discovery_process(&$valid, $os, $sensor_class, $pre_cache) +function discovery_process($os, $sensor_class, $pre_cache) { $discovery = $os->getDiscovery('sensors'); $device = $os->getDeviceArray(); @@ -998,7 +769,7 @@ function discovery_process(&$valid, $os, $sensor_class, $pre_cache) } } - discover_sensor($valid['sensor'], $sensor_class, $device, $oid, $uindex, $sensor_name, $descr, $divisor, $multiplier, $low_limit, $low_warn_limit, $warn_limit, $high_limit, $value, 'snmp', $entPhysicalIndex, $entPhysicalIndex_measured, $user_function, $group, $data['rrd_type'] ?? 'GAUGE'); + discover_sensor(null, $sensor_class, $device, $oid, $uindex, $sensor_name, $descr, $divisor, $multiplier, $low_limit, $low_warn_limit, $warn_limit, $high_limit, $value, 'snmp', $entPhysicalIndex, $entPhysicalIndex_measured, $user_function, $group, $data['rrd_type'] ?? 'GAUGE'); if ($sensor_class === 'state') { create_sensor_to_state_index($device, $sensor_name, $uindex); @@ -1014,7 +785,7 @@ function discovery_process(&$valid, $os, $sensor_class, $pre_cache) * @param OS $os * @param array $pre_cache */ -function sensors($types, $os, $valid, $pre_cache = []) +function sensors($types, $os, $pre_cache = []) { $device = &$os->getDeviceArray(); foreach ((array) $types as $sensor_class) { @@ -1032,9 +803,8 @@ function sensors($types, $os, $valid, $pre_cache = []) include $dir . '/rfc1628.inc.php'; } } - discovery_process($valid, $os, $sensor_class, $pre_cache); - d_echo($valid['sensor'][$sensor_class] ?? []); - check_valid_sensors($device, $sensor_class, $valid['sensor']); + discovery_process($os, $sensor_class, $pre_cache); + app('sensor-discovery')->sync(sensor_class: $sensor_class, poller_type: 'snmp'); echo "\n"; } } diff --git a/includes/discovery/sensors.inc.php b/includes/discovery/sensors.inc.php index 95da807e03..6a9267fbba 100644 --- a/includes/discovery/sensors.inc.php +++ b/includes/discovery/sensors.inc.php @@ -3,8 +3,6 @@ use LibreNMS\Config; use LibreNMS\OS; -$valid['sensor'] = []; - /** @var OS $os */ $pre_cache = $os->preCache(); @@ -84,7 +82,7 @@ $run_sensors = [ // filter submodules $run_sensors = array_intersect($run_sensors, Config::get('discovery_submodules.sensors', $run_sensors)); -sensors($run_sensors, $os, $valid, $pre_cache); +sensors($run_sensors, $os, $pre_cache); unset( $pre_cache, $run_sensors, diff --git a/includes/discovery/sensors/airflow/apc.inc.php b/includes/discovery/sensors/airflow/apc.inc.php index ad19a1cc6e..f68888b0bd 100644 --- a/includes/discovery/sensors/airflow/apc.inc.php +++ b/includes/discovery/sensors/airflow/apc.inc.php @@ -28,6 +28,6 @@ foreach ($pre_cache['cooling_unit_analog'] as $index => $data) { $scale = $data['coolingUnitStatusAnalogScale'] ?? null; $value = $data['coolingUnitStatusAnalogValue'] ?? null; if (preg_match('/Airflow/', $descr) && $data['coolingUnitStatusAnalogUnits'] == 'CFM' && $value >= 0) { - discover_sensor($valid['sensor'], 'airflow', $device, $cur_oid, $cur_oid, 'apc', $descr, $scale, 1, null, null, null, null, $value); + discover_sensor(null, 'airflow', $device, $cur_oid, $cur_oid, 'apc', $descr, $scale, 1, null, null, null, null, $value); } } diff --git a/includes/discovery/sensors/airflow/geist-watchdog.inc.php b/includes/discovery/sensors/airflow/geist-watchdog.inc.php index cbc485d019..0687b5e6d4 100644 --- a/includes/discovery/sensors/airflow/geist-watchdog.inc.php +++ b/includes/discovery/sensors/airflow/geist-watchdog.inc.php @@ -26,5 +26,5 @@ $value = snmp_get($device, 'climateAirflow', '-Oqv', 'GEIST-MIB-V3'); $current_oid = '.1.3.6.1.4.1.21239.2.2.1.9.1'; $descr = 'Airflow'; if (is_numeric($value)) { - discover_sensor($valid['sensor'], 'airflow', $device, $current_oid, 'climateAirflow', 'geist-watchdog', $descr, 1, 1, null, null, null, null, $value); + discover_sensor(null, 'airflow', $device, $current_oid, 'climateAirflow', 'geist-watchdog', $descr, 1, 1, null, null, null, null, $value); } diff --git a/includes/discovery/sensors/ber/infinera-groove.inc.php b/includes/discovery/sensors/ber/infinera-groove.inc.php index 1dd8c0230b..3620fde38a 100644 --- a/includes/discovery/sensors/ber/infinera-groove.inc.php +++ b/includes/discovery/sensors/ber/infinera-groove.inc.php @@ -30,6 +30,6 @@ foreach ($pre_cache['infineragroove_portTable'] as $index => $data) { $oid = '.1.3.6.1.4.1.42229.1.2.4.1.19.1.1.26.' . $index; $value = $data['ochOsPreFecBer']; $divisor = 1; - discover_sensor($valid['sensor'], 'ber', $device, $oid, 'ochOsPreFecBer.' . $index, 'infinera-groove', $descr, $divisor, '1', null, null, null, null, $value); + discover_sensor(null, 'ber', $device, $oid, 'ochOsPreFecBer.' . $index, 'infinera-groove', $descr, $divisor, '1', null, null, null, null, $value); } } diff --git a/includes/discovery/sensors/bitrate/luminato.inc.php b/includes/discovery/sensors/bitrate/luminato.inc.php index 367eb8a523..eba56f3309 100644 --- a/includes/discovery/sensors/bitrate/luminato.inc.php +++ b/includes/discovery/sensors/bitrate/luminato.inc.php @@ -67,7 +67,7 @@ if (is_array($pre_cache['transfer'])) { $limitwarn = $defrate * 0.8; //80% $lowlimit = 0; $lowwarnlimit = $defrate * 0.1; //10% - discover_sensor($valid['sensor'], 'bitrate', $device, $oid, $key, $type, $descr, $divisor, 1, $lowlimit, $lowwarnlimit, $limitwarn, $limit, $value, 'snmp', null, null, null, $group); + discover_sensor(null, 'bitrate', $device, $oid, $key, $type, $descr, $divisor, 1, $lowlimit, $lowwarnlimit, $limitwarn, $limit, $value, 'snmp', null, null, null, $group); } } } diff --git a/includes/discovery/sensors/bitrate/terra-sdi410c.inc.php b/includes/discovery/sensors/bitrate/terra-sdi410c.inc.php index f47b4516ec..4920499428 100644 --- a/includes/discovery/sensors/bitrate/terra-sdi410c.inc.php +++ b/includes/discovery/sensors/bitrate/terra-sdi410c.inc.php @@ -40,7 +40,7 @@ if (is_array($pre_cache['sdi410cstatus'])) { $value = $br * $multiplier; $group = 'Streams'; discover_sensor( - $valid['sensor'], + null, 'bitrate', $device, $oid, diff --git a/includes/discovery/sensors/bitrate/terra-sdi480.inc.php b/includes/discovery/sensors/bitrate/terra-sdi480.inc.php index 1db2b3ddfc..b032b54737 100644 --- a/includes/discovery/sensors/bitrate/terra-sdi480.inc.php +++ b/includes/discovery/sensors/bitrate/terra-sdi480.inc.php @@ -42,7 +42,7 @@ if (is_array($pre_cache['sdi480status'])) { $value = $br * $multiplier; $group = 'Inputs'; discover_sensor( - $valid['sensor'], + null, 'bitrate', $device, $oid, @@ -75,7 +75,7 @@ if (is_array($pre_cache['sdi480status'])) { $value = $br * $multiplier; $group = 'Streams'; discover_sensor( - $valid['sensor'], + null, 'bitrate', $device, $oid, diff --git a/includes/discovery/sensors/charge/apc.inc.php b/includes/discovery/sensors/charge/apc.inc.php index 7cc34bd0a1..94e310fe40 100644 --- a/includes/discovery/sensors/charge/apc.inc.php +++ b/includes/discovery/sensors/charge/apc.inc.php @@ -19,7 +19,7 @@ if (! empty($oids)) { $warnlimit = 10; $descr = 'Battery Charge'; - discover_sensor($valid['sensor'], 'charge', $device, $current_oid, $index, $sensorType, $descr, $precision, 1, $lowlimit, $warnlimit, null, $limit, $current_val); + discover_sensor(null, 'charge', $device, $current_oid, $index, $sensorType, $descr, $precision, 1, $lowlimit, $warnlimit, null, $limit, $current_val); } else { // Try to just get capacity $oids = snmp_get($device, '.1.3.6.1.4.1.318.1.1.1.2.2.1.0', '-OsqnU'); @@ -40,6 +40,6 @@ if (! empty($oids)) { $warnlimit = 10; $descr = 'Battery Charge'; - discover_sensor($valid['sensor'], 'charge', $device, $current_oid, $index, $sensorType, $descr, $precision, 1, $lowlimit, $warnlimit, null, $limit, $current_val); + discover_sensor(null, 'charge', $device, $current_oid, $index, $sensorType, $descr, $precision, 1, $lowlimit, $warnlimit, null, $limit, $current_val); } }//end if diff --git a/includes/discovery/sensors/charge/compas.inc.php b/includes/discovery/sensors/charge/compas.inc.php index 9c1b79d962..d6bd1cd4bd 100644 --- a/includes/discovery/sensors/charge/compas.inc.php +++ b/includes/discovery/sensors/charge/compas.inc.php @@ -28,5 +28,5 @@ $index = 0; if (is_numeric($chargeCapacity)) { $sensorType = 'compas'; $descr = 'Battery Charge'; - discover_sensor($valid['sensor'], 'charge', $device, $curOID, $index, $sensorType, $descr, '1', '1', null, null, null, null, $chargeCapacity); + discover_sensor(null, 'charge', $device, $curOID, $index, $sensorType, $descr, '1', '1', null, null, null, null, $chargeCapacity); } diff --git a/includes/discovery/sensors/charge/dsm.inc.php b/includes/discovery/sensors/charge/dsm.inc.php index fe30e0ff01..cd309922ea 100644 --- a/includes/discovery/sensors/charge/dsm.inc.php +++ b/includes/discovery/sensors/charge/dsm.inc.php @@ -24,5 +24,5 @@ $ups_device_model = str_replace('"', '', snmp_get($device, $ups_device_model_oid $ups_charge_oid = '.1.3.6.1.4.1.6574.4.3.1.1.0'; $ups_charge = snmp_get($device, $ups_charge_oid, '-Oqv'); if (is_numeric($ups_charge)) { - discover_sensor($valid['sensor'], 'charge', $device, $ups_charge_oid, 'UPSChargeValue', $ups_device_manufacturer . ' ' . $ups_device_model, 'UPS Charge Value', 1, 1, 0, 10, null, 100, $ups_charge); + discover_sensor(null, 'charge', $device, $ups_charge_oid, 'UPSChargeValue', $ups_device_manufacturer . ' ' . $ups_device_model, 'UPS Charge Value', 1, 1, 0, 10, null, 100, $ups_charge); } diff --git a/includes/discovery/sensors/charge/eatonups.inc.php b/includes/discovery/sensors/charge/eatonups.inc.php index d3f3d74e26..6b57444e13 100644 --- a/includes/discovery/sensors/charge/eatonups.inc.php +++ b/includes/discovery/sensors/charge/eatonups.inc.php @@ -23,7 +23,7 @@ if (! empty($charge)) { $descr = 'Battery Charge'; discover_sensor( - $valid['sensor'], + null, 'charge', $device, $charge_oid, diff --git a/includes/discovery/sensors/charge/eltex-mes23xx.inc.php b/includes/discovery/sensors/charge/eltex-mes23xx.inc.php index 8dadcb9560..926c756c9b 100644 --- a/includes/discovery/sensors/charge/eltex-mes23xx.inc.php +++ b/includes/discovery/sensors/charge/eltex-mes23xx.inc.php @@ -40,7 +40,7 @@ if ($oids) { $lowwarnlimit = 10; $descr = 'Battery Charge'; - discover_sensor($valid['sensor'], 'charge', $device, $oid, $index, $type, $descr, 1, 1, $lowlimit, $lowwarnlimit, $limitwarn, $limit, $value); + discover_sensor(null, 'charge', $device, $oid, $index, $type, $descr, 1, 1, $lowlimit, $lowwarnlimit, $limitwarn, $limit, $value); } } } diff --git a/includes/discovery/sensors/charge/linux.inc.php b/includes/discovery/sensors/charge/linux.inc.php index 84a14f0b3e..0a818e8444 100644 --- a/includes/discovery/sensors/charge/linux.inc.php +++ b/includes/discovery/sensors/charge/linux.inc.php @@ -11,6 +11,6 @@ if (preg_match('/(Linux).+(ntc)/', $device['sysDescr'])) { $index = '116.8'; $value = snmp_get($device, $oid . $index, '-Oqv'); if (is_numeric($value)) { - discover_sensor($valid['sensor'], 'charge', $device, $oid . $index, $index, $sensor_type, $descr, 1, 1, $lowlimit, $lowwarnlimit, $warnlimit, $limit, $value); + discover_sensor(null, 'charge', $device, $oid . $index, $index, $sensor_type, $descr, 1, 1, $lowlimit, $lowwarnlimit, $warnlimit, $limit, $value); } } diff --git a/includes/discovery/sensors/charge/netagent2.inc.php b/includes/discovery/sensors/charge/netagent2.inc.php index 7792abf680..499e521769 100644 --- a/includes/discovery/sensors/charge/netagent2.inc.php +++ b/includes/discovery/sensors/charge/netagent2.inc.php @@ -35,7 +35,7 @@ if (! empty($charge)) { $descr = 'Battery Charge'; discover_sensor( - $valid['sensor'], + null, 'charge', $device, $charge_oid, diff --git a/includes/discovery/sensors/charge/rfc1628.inc.php b/includes/discovery/sensors/charge/rfc1628.inc.php index 8deff75166..ccab2733f8 100644 --- a/includes/discovery/sensors/charge/rfc1628.inc.php +++ b/includes/discovery/sensors/charge/rfc1628.inc.php @@ -7,7 +7,7 @@ $value = snmp_get($device, 'upsEstimatedChargeRemaining.0', '-OvqU', 'UPS-MIB'); if (is_numeric($value)) { discover_sensor( - $valid['sensor'], + null, 'charge', $device, '.1.3.6.1.2.1.33.1.2.4.0', diff --git a/includes/discovery/sensors/charge/sinetica.inc.php b/includes/discovery/sensors/charge/sinetica.inc.php index 01b94b8ff0..9bdb2a9a63 100644 --- a/includes/discovery/sensors/charge/sinetica.inc.php +++ b/includes/discovery/sensors/charge/sinetica.inc.php @@ -34,7 +34,7 @@ if (! empty($charge)) { $descr = 'Battery Charge'; discover_sensor( - $valid['sensor'], + null, 'charge', $device, $charge_oid, diff --git a/includes/discovery/sensors/charge/unix.inc.php b/includes/discovery/sensors/charge/unix.inc.php index ce24a172df..6b5d813c4e 100644 --- a/includes/discovery/sensors/charge/unix.inc.php +++ b/includes/discovery/sensors/charge/unix.inc.php @@ -36,7 +36,7 @@ if (! empty($snmpData)) { if (! empty($value)) { $oid = Oid::toNumeric('NET-SNMP-EXTEND-MIB::nsExtendOutLine."ups-nut".' . $index); discover_sensor( - $valid['sensor'], + null, 'charge', $device, $oid, diff --git a/includes/discovery/sensors/chromatic_dispersion/infinera-groove.inc.php b/includes/discovery/sensors/chromatic_dispersion/infinera-groove.inc.php index 909b5ac6b0..91e3ce281a 100644 --- a/includes/discovery/sensors/chromatic_dispersion/infinera-groove.inc.php +++ b/includes/discovery/sensors/chromatic_dispersion/infinera-groove.inc.php @@ -27,6 +27,6 @@ foreach ($pre_cache['infineragroove_portTable'] as $index => $data) { $descr = $data['portAlias'] . ' CD'; $oid = '.1.3.6.1.4.1.42229.1.2.4.1.19.1.1.23.' . $index; $value = $data['ochOsCD']; - discover_sensor($valid['sensor'], 'chromatic_dispersion', $device, $oid, 'ochOsCD.' . $index, 'infinera-groove', $descr, null, '1', null, null, null, null, $value); + discover_sensor(null, 'chromatic_dispersion', $device, $oid, 'ochOsCD.' . $index, 'infinera-groove', $descr, null, '1', null, null, null, null, $value); } } diff --git a/includes/discovery/sensors/cisco-entity-sensor.inc.php b/includes/discovery/sensors/cisco-entity-sensor.inc.php index 62707881ad..e4df1a9b9e 100644 --- a/includes/discovery/sensors/cisco-entity-sensor.inc.php +++ b/includes/discovery/sensors/cisco-entity-sensor.inc.php @@ -222,7 +222,7 @@ if ($device['os_group'] == 'cisco') { } } - discover_sensor($valid['sensor'], $type, $device, $oid, $index, 'cisco-entity-sensor', ucwords($descr), $divisor, $multiplier, $limit_low, $warn_limit_low, $warn_limit, $limit, $current, 'snmp', $entPhysicalIndex, $entry['entSensorMeasuredEntity'], null); + discover_sensor(null, $type, $device, $oid, $index, 'cisco-entity-sensor', ucwords($descr), $divisor, $multiplier, $limit_low, $warn_limit_low, $warn_limit, $limit, $current, 'snmp', $entPhysicalIndex, $entry['entSensorMeasuredEntity'], null); //Cisco IOS-XR : add a fake sensor to graph as dbm if ($type == 'power' and $device['os'] == 'iosxr' and (preg_match('/power (R|T)x/i', $descr) or preg_match('/(R|T)x Power/i', $descr) or preg_match('/(R|T)x Lane/i', $descr))) { // convert Watts to dbm @@ -235,7 +235,7 @@ if ($device['os_group'] == 'cisco') { $limit = isset($limit_low) ? round(mw_to_dbm($limit * $multiplier), 3) : null; $current = mw_to_dbm($current * $multiplier); //echo("\n".$valid['sensor'].", $type, $device, $oid, $index, 'cisco-entity-sensor', $descr, $divisor, $multiplier, $limit_low, $warn_limit_low, $warn_limit, $limit, $current, $user_func"); - discover_sensor($valid['sensor'], $type, $device, $oid, $index, 'cisco-entity-sensor', $descr, $divisor, $multiplier, $limit_low, $warn_limit_low, $warn_limit, $limit, $current, 'snmp', $entPhysicalIndex, $entry['entSensorMeasuredEntity'], $user_func); + discover_sensor(null, $type, $device, $oid, $index, 'cisco-entity-sensor', $descr, $divisor, $multiplier, $limit_low, $warn_limit_low, $warn_limit, $limit, $current, 'snmp', $entPhysicalIndex, $entry['entSensorMeasuredEntity'], $user_func); } } @@ -247,4 +247,8 @@ if ($device['os_group'] == 'cisco') { unset( $entity_array ); + + foreach (array_flip($entitysensor) as $type) { + app('sensor-discovery')->sync(sensor_class: $type, poller_type: 'snmp'); + } }//end if diff --git a/includes/discovery/sensors/count/christie-projector.inc.php b/includes/discovery/sensors/count/christie-projector.inc.php index bd4aaec3d7..6cd69012ab 100644 --- a/includes/discovery/sensors/count/christie-projector.inc.php +++ b/includes/discovery/sensors/count/christie-projector.inc.php @@ -19,7 +19,7 @@ use Illuminate\Support\Str; if (Str::startsWith($device['sysObjectID'], '.1.3.6.1.4.1.25766')) { discover_sensor( - $valid['sensor'], + null, 'count', $device, '.1.3.6.1.4.1.25766.1.12.1.1.3.5.1.6.1', diff --git a/includes/discovery/sensors/count/cisco.inc.php b/includes/discovery/sensors/count/cisco.inc.php index 9ae11f3768..60509628c8 100644 --- a/includes/discovery/sensors/count/cisco.inc.php +++ b/includes/discovery/sensors/count/cisco.inc.php @@ -31,6 +31,6 @@ foreach ($tables as $tablevalue) { } else { $descr = ucwords($temp[$index][$tablevalue['descr']]); } - discover_sensor($valid['sensor'], 'count', $device, $cur_oid . $index, $index, $state_name, $descr, 1, 1, null, null, null, null, $temp[$index][$tablevalue['state_name']], 'snmp', $index); + discover_sensor(null, 'count', $device, $cur_oid . $index, $index, $state_name, $descr, 1, 1, null, null, null, null, $temp[$index][$tablevalue['state_name']], 'snmp', $index); } } diff --git a/includes/discovery/sensors/count/dhcpatriot.inc.php b/includes/discovery/sensors/count/dhcpatriot.inc.php index dfb9f7faff..81f450507f 100644 --- a/includes/discovery/sensors/count/dhcpatriot.inc.php +++ b/includes/discovery/sensors/count/dhcpatriot.inc.php @@ -69,7 +69,7 @@ foreach ($oids as $index => $entry) { if (! empty($current) && $current !== 'FULL:0') { discover_sensor( - $valid['sensor'], + null, $class, $device, $oid, diff --git a/includes/discovery/sensors/count/epson-projector.inc.php b/includes/discovery/sensors/count/epson-projector.inc.php index 5662a52b97..1a505b17fc 100644 --- a/includes/discovery/sensors/count/epson-projector.inc.php +++ b/includes/discovery/sensors/count/epson-projector.inc.php @@ -19,7 +19,7 @@ use Illuminate\Support\Str; if (Str::startsWith($device['sysObjectID'], '.1.3.6.1.4.1.1248.4.1')) { discover_sensor( - $valid['sensor'], + null, 'count', $device, '.1.3.6.1.4.1.1248.4.1.1.1.1.0', diff --git a/includes/discovery/sensors/count/fortigate.inc.php b/includes/discovery/sensors/count/fortigate.inc.php index a5b939dad7..88fb74f328 100644 --- a/includes/discovery/sensors/count/fortigate.inc.php +++ b/includes/discovery/sensors/count/fortigate.inc.php @@ -24,7 +24,7 @@ if (! empty($licenseOids)) { $descr = $entry['fgLicContractDesc']; discover_sensor( - $valid['sensor'], + null, 'count', $device, '.1.3.6.1.4.1.12356.101.4.6.3.1.2.1.2.' . $index, @@ -64,7 +64,7 @@ foreach ($session_rate as $descr => $oid) { $result = str_replace(' Sessions Per Second', '', $result); discover_sensor( - $valid['sensor'], + null, 'count', $device, $oid_num . '.0', @@ -97,7 +97,7 @@ if ($systemMode == 'activePassive' || $systemMode == 'activeActive') { // Create a count sensor and set warning to current cluster count discover_sensor( - $valid['sensor'], + null, 'count', $device, $fgHaStatsIndex_num, diff --git a/includes/discovery/sensors/count/printer.inc.php b/includes/discovery/sensors/count/printer.inc.php index f5ed5737de..6daec04ef0 100644 --- a/includes/discovery/sensors/count/printer.inc.php +++ b/includes/discovery/sensors/count/printer.inc.php @@ -15,7 +15,7 @@ $walk = snmpwalk_cache_oid($device, 'prtMarkerTable', [], 'Printer-MIB'); foreach ($walk as $index => $data) { discover_sensor( - $valid['sensor'], + null, 'count', $device, '.1.3.6.1.2.1.43.10.2.1.4.' . $index, // Printer-MIB::prtMarkerLifeCount.1.1 @@ -32,7 +32,7 @@ foreach ($walk as $index => $data) { ); discover_sensor( - $valid['sensor'], + null, 'count', $device, '.1.3.6.1.2.1.43.10.2.1.5.' . $index, // Printer-MIB::prtMarkerPowerOnCount.1.1 @@ -68,7 +68,7 @@ if ($device['os'] == 'konica') { $oidArray = explode('.', $oid); $maxKey = max(array_keys($oidArray)); $index = str_replace(' ', '', ucwords($cntName)) . '.' . $oidArray[$maxKey - 1] . '.' . $oidArray[$maxKey]; - discover_sensor($valid['sensor'], 'count', $device, $oid, $index, $device['os'], $cntName, 1, 1, null, null, null, null, $value, 'snmp', null, null, null, 'Konica MIB'); + discover_sensor(null, 'count', $device, $oid, $index, $device['os'], $cntName, 1, 1, null, null, null, null, $value, 'snmp', null, null, null, 'Konica MIB'); } } } diff --git a/includes/discovery/sensors/count/sonicwall.inc.php b/includes/discovery/sensors/count/sonicwall.inc.php index 496b16c666..5039a8dd05 100644 --- a/includes/discovery/sensors/count/sonicwall.inc.php +++ b/includes/discovery/sensors/count/sonicwall.inc.php @@ -23,7 +23,7 @@ if (Str::startsWith($device['sysObjectID'], '.1.3.6.1.4.1.8741.6')) { $current = snmp_get($device, '.1.3.6.1.4.1.8741.6.2.1.9.0', '-Ovq'); discover_sensor( - $valid['sensor'], + null, 'count', $device, '.1.3.6.1.4.1.8741.6.2.1.9.0', // SNWL-SSLVPN-MIB::activeUserLicense.0 diff --git a/includes/discovery/sensors/count/webmon.inc.php b/includes/discovery/sensors/count/webmon.inc.php index 7adc49f31e..7206ed8cfa 100644 --- a/includes/discovery/sensors/count/webmon.inc.php +++ b/includes/discovery/sensors/count/webmon.inc.php @@ -42,7 +42,7 @@ foreach ($prefixes as $prefix => $numOidPrefix) { if ($oid[$prefix . 'Units']) { $descr .= '(' . $oid[$prefix . 'Units'] . ')'; } - discover_sensor($valid['sensor'], 'count', $device, $num_oid, $prefix . 'LiveRaw.' . $index, 'webmon', $descr, '1', '1', $lowLimit, $lowWarnLimit, $highWarnLimit, $highLimit, $value, 'snmp', null, null, null, $group); + discover_sensor(null, 'count', $device, $num_oid, $prefix . 'LiveRaw.' . $index, 'webmon', $descr, '1', '1', $lowLimit, $lowWarnLimit, $highWarnLimit, $highLimit, $value, 'snmp', null, null, null, $group); } } } diff --git a/includes/discovery/sensors/current/adva_fsp150.inc.php b/includes/discovery/sensors/current/adva_fsp150.inc.php index c05bcc2c4a..7a44f2491b 100644 --- a/includes/discovery/sensors/current/adva_fsp150.inc.php +++ b/includes/discovery/sensors/current/adva_fsp150.inc.php @@ -40,7 +40,7 @@ foreach (array_keys($pre_cache['adva_fsp150']) as $index) { $current = $pre_cache['adva_fsp150'][$index][$entry['sensor_name']] / $divisor; discover_sensor( - $valid['sensor'], + null, 'current', $device, $oid, @@ -73,7 +73,7 @@ foreach ($pre_cache['adva_fsp150_ports'] as $index => $entry) { $descr = ($pre_cache['adva_fsp150_ifName'][$entry['cmEthernetNetPortIfIndex']]['ifName'] ?? 'ifIndex ' . $entry['cmEthernetNetPortIfIndex']) . ' BIAS'; discover_sensor( - $valid['sensor'], + null, 'current', $device, $oid, @@ -102,7 +102,7 @@ foreach ($pre_cache['adva_fsp150_ports'] as $index => $entry) { $entPhysicalIndex_measured = 'ports'; $descr = ($pre_cache['adva_fsp150_ifName'][$entry['cmEthernetAccPortIfIndex']]['ifName'] ?? 'ifIndex ' . $entry['cmEthernetAccPortIfIndex']) . ' BIAS'; discover_sensor( - $valid['sensor'], + null, 'current', $device, $oid, @@ -132,7 +132,7 @@ foreach ($pre_cache['adva_fsp150_ports'] as $index => $entry) { $descr = ($pre_cache['adva_fsp150_ifName'][$entry['cmEthernetTrafficPortIfIndex']]['ifName'] ?? 'ifIndex ' . $entry['cmEthernetTrafficPortIfIndex']) . ' BIAS'; discover_sensor( - $valid['sensor'], + null, 'current', $device, $oid, diff --git a/includes/discovery/sensors/current/adva_fsp3kr7.inc.php b/includes/discovery/sensors/current/adva_fsp3kr7.inc.php index 45524f7192..3a2b8be74f 100644 --- a/includes/discovery/sensors/current/adva_fsp3kr7.inc.php +++ b/includes/discovery/sensors/current/adva_fsp3kr7.inc.php @@ -31,7 +31,7 @@ if (is_array($pre_cache['adva_fsp3kr7_Card'])) { $current = $pre_cache['adva_fsp3kr7_Card'][$index]['eqptPhysInstValuePsuAmpere'] / $divisor; discover_sensor( - $valid['sensor'], + null, 'current', $device, $oid, diff --git a/includes/discovery/sensors/current/apc.inc.php b/includes/discovery/sensors/current/apc.inc.php index 598f2beff5..9ccf128196 100644 --- a/includes/discovery/sensors/current/apc.inc.php +++ b/includes/discovery/sensors/current/apc.inc.php @@ -39,7 +39,7 @@ if (isset($oids) && $oids) { } else { $descr = 'Output'; } - discover_sensor($valid['sensor'], 'current', $device, $current_oid, $index, $type, $descr, '10', '1', $lowlimit, null, $warnlimit, $limit, $current); + discover_sensor(null, 'current', $device, $current_oid, $index, $type, $descr, '10', '1', $lowlimit, null, $warnlimit, $limit, $current); } } } @@ -86,7 +86,7 @@ if (isset($oids) && $oids) { } else { $descr = 'Output'; } - discover_sensor($valid['sensor'], 'current', $device, $current_oid, $index, $type, $descr, '10', '1', $lowlimit, null, $warnlimit, $limit, $current); + discover_sensor(null, 'current', $device, $current_oid, $index, $type, $descr, '10', '1', $lowlimit, null, $warnlimit, $limit, $current); } } } @@ -130,7 +130,7 @@ if (isset($oids) && $oids) { $lowlimit = snmp_get($device, $lowlimit_oid, '-Oqv', ''); $warnlimit = snmp_get($device, $warnlimit_oid, '-Oqv', ''); if ($limit != -1 && $lowlimit != -1 && $warnlimit != -1) { - discover_sensor($valid['sensor'], 'current', $device, $current_oid, $index, $type, $descr, '10', '1', $lowlimit, null, $warnlimit, $limit, $current); + discover_sensor(null, 'current', $device, $current_oid, $index, $type, $descr, '10', '1', $lowlimit, null, $warnlimit, $limit, $current); } } } @@ -177,7 +177,7 @@ if (isset($oids) && $oids) { } $descr = 'Outlet ' . $index . ' - ' . snmp_get($device, $name_oid, '-Oqv', ''); - discover_sensor($valid['sensor'], 'current', $device, $current_oid, $index, $type, $descr, '10', '1', $lowlimit, null, $warnlimit, $limit, $current); + discover_sensor(null, 'current', $device, $current_oid, $index, $type, $descr, '10', '1', $lowlimit, null, $warnlimit, $limit, $current); } } } @@ -209,7 +209,7 @@ if (isset($oids) && $oids) { $warnlimit = snmp_get($device, $warnlimit_oid, '-Oqv', ''); // No / $precision here! Nice, APC! $descr = 'Output Feed'; - discover_sensor($valid['sensor'], 'current', $device, $current_oid, $index, $type, $descr, '10', '1', $lowlimit, null, $warnlimit, $limit, $current); + discover_sensor(null, 'current', $device, $current_oid, $index, $type, $descr, '10', '1', $lowlimit, null, $warnlimit, $limit, $current); } unset($oids); @@ -231,10 +231,10 @@ if (isset($in_oids)) { $in_index = '3.1.4.' . $index; if (substr($index, 0, 1) == 2 && $data['upsPhaseInputCurrent'] != -1) { $descr = 'Phase ' . substr($index, -1) . ' Bypass Input'; - discover_sensor($valid['sensor'], 'current', $device, $current_oid, $in_index, $type, $descr, $divisor, 0, null, null, null, null, $current); + discover_sensor(null, 'current', $device, $current_oid, $in_index, $type, $descr, $divisor, 0, null, null, null, null, $current); } elseif (substr($index, 0, 1) == 1) { $descr = 'Phase ' . substr($index, -1) . ' Input'; - discover_sensor($valid['sensor'], 'current', $device, $current_oid, $in_index, $type, $descr, $divisor, 0, null, null, null, null, $current); + discover_sensor(null, 'current', $device, $current_oid, $in_index, $type, $descr, $divisor, 0, null, null, null, null, $current); } } } @@ -253,7 +253,7 @@ foreach ($oids as $index => $data) { $current = $data['upsPhaseOutputCurrent'] / $divisor; } if ($current >= -1) { - discover_sensor($valid['sensor'], 'current', $device, $current_oid, $index, $type, $descr, $divisor, 1, null, null, null, null, $current); + discover_sensor(null, 'current', $device, $current_oid, $index, $type, $descr, $divisor, 1, null, null, null, null, $current); } } unset($index); diff --git a/includes/discovery/sensors/current/awplus.inc.php b/includes/discovery/sensors/current/awplus.inc.php index d71be42914..cfb514d496 100644 --- a/includes/discovery/sensors/current/awplus.inc.php +++ b/includes/discovery/sensors/current/awplus.inc.php @@ -15,7 +15,7 @@ if ($pre_cache['awplus-sfpddm']) { $descr = $tmp['ifName']; $oid = '.1.3.6.1.4.1.207.8.4.4.3.28.1.3.1.3.' . $index; discover_sensor( - $valid['sensor'], + null, 'current', $device, $oid, diff --git a/includes/discovery/sensors/current/ciscosb.inc.php b/includes/discovery/sensors/current/ciscosb.inc.php index f234e15563..ddcc52dd84 100644 --- a/includes/discovery/sensors/current/ciscosb.inc.php +++ b/includes/discovery/sensors/current/ciscosb.inc.php @@ -27,7 +27,7 @@ foreach ($pre_cache['ciscosb_rlPhyTestGetResult'] as $index => $ciscosb_data) { $entPhysicalIndex = $index; $entPhysicalIndex_measured = 'ports'; if (is_numeric($current)) { - discover_sensor($valid['sensor'], 'current', $device, $oid, $index, $sensor_type, $descr, $divisor, $multiplier, null, null, null, null, $current, 'snmp', $entPhysicalIndex, $entPhysicalIndex_measured); + discover_sensor(null, 'current', $device, $oid, $index, $sensor_type, $descr, $divisor, $multiplier, null, null, null, null, $current, 'snmp', $entPhysicalIndex, $entPhysicalIndex_measured); } } } diff --git a/includes/discovery/sensors/current/commander-plus.inc.php b/includes/discovery/sensors/current/commander-plus.inc.php index 103744f127..0ea4d2d3be 100644 --- a/includes/discovery/sensors/current/commander-plus.inc.php +++ b/includes/discovery/sensors/current/commander-plus.inc.php @@ -27,7 +27,7 @@ $oid = '.1.3.6.1.4.1.18642.1.2.2.1.0'; $descr = 'Battery current'; $divisor = 1; $multiplier = 1; -discover_sensor($valid['sensor'], 'current', $device, $oid, 'batteryCurrent', 'commander-plus', $descr, $divisor, $multiplier, null, null, null, null, $current); +discover_sensor(null, 'current', $device, $oid, 'batteryCurrent', 'commander-plus', $descr, $divisor, $multiplier, null, null, null, null, $current); $current = snmp_get($device, 'rectifierLoadCurrent.0', '-Oqv', 'CCPOWER-MIB'); $oid = '.1.3.6.1.4.1.18642.1.2.1.2.0'; @@ -36,4 +36,4 @@ $divisor = 1; $multiplier = 1; $limit_low = 0; $limit = 5000; -discover_sensor($valid['sensor'], 'current', $device, $oid, 'rectifierLoadCurrent', 'commander-plus', $descr, $divisor, $multiplier, $limit_low, null, null, $limit, $current); +discover_sensor(null, 'current', $device, $oid, 'rectifierLoadCurrent', 'commander-plus', $descr, $divisor, $multiplier, $limit_low, null, null, $limit, $current); diff --git a/includes/discovery/sensors/current/compas.inc.php b/includes/discovery/sensors/current/compas.inc.php index f1c3052311..3e17779611 100644 --- a/includes/discovery/sensors/current/compas.inc.php +++ b/includes/discovery/sensors/current/compas.inc.php @@ -29,7 +29,7 @@ $index = 'es1dc1DataRectifiersRectifiersOutCurrent'; if (is_numeric($rectifiersOutputCurrent) && is_numeric($rectifiersOutputCurrentMax)) { $sensorType = 'compas'; $descr = 'Output Current'; - discover_sensor($valid['sensor'], 'current', $device, $curOID, $index, $sensorType, $descr, '1', '1', null, null, null, $rectifiersOutputCurrentMax, $rectifiersOutputCurrent); + discover_sensor(null, 'current', $device, $curOID, $index, $sensorType, $descr, '1', '1', null, null, null, $rectifiersOutputCurrentMax, $rectifiersOutputCurrent); } $loadCurrent = snmp_get($device, 'es1dc1DataLoadLoadCurrent.0', '-Ovqe', 'SITE-MONITORING-MIB'); $curOID = '.1.3.6.1.4.1.26854.3.2.1.20.1.20.1.13.3.52.0'; @@ -37,7 +37,7 @@ $index = 'es1dc1DataLoadLoadCurrent'; if (is_numeric($loadCurrent)) { $sensorType = 'compas'; $descr = 'Load Current'; - discover_sensor($valid['sensor'], 'current', $device, $curOID, $index, $sensorType, $descr, '1', '1', null, null, null, null, $loadCurrent); + discover_sensor(null, 'current', $device, $curOID, $index, $sensorType, $descr, '1', '1', null, null, null, null, $loadCurrent); } $batteryInputCurrent = snmp_get($device, 'es1dc1DataBatBatInputCurrent.0', '-Ovqe', 'SITE-MONITORING-MIB'); $curOID = '.1.3.6.1.4.1.26854.3.2.1.20.1.20.1.13.3.61.0'; @@ -45,5 +45,5 @@ $index = 'es1dc1DataBatBatInputCurrent'; if (is_numeric($batteryInputCurrent)) { $sensorType = 'compas'; $descr = 'Battery Input Current'; - discover_sensor($valid['sensor'], 'current', $device, $curOID, $index, $sensorType, $descr, '1', '1', null, null, null, null, $batteryInputCurrent); + discover_sensor(null, 'current', $device, $curOID, $index, $sensorType, $descr, '1', '1', null, null, null, null, $batteryInputCurrent); } diff --git a/includes/discovery/sensors/current/comware.inc.php b/includes/discovery/sensors/current/comware.inc.php index 6bb930c8bd..0b160a3ea7 100644 --- a/includes/discovery/sensors/current/comware.inc.php +++ b/includes/discovery/sensors/current/comware.inc.php @@ -33,6 +33,6 @@ foreach ($pre_cache['comware_oids'] as $index => $entry) { $entPhysicalIndex_measured = 'ports'; $descr = makeshortif($interface['ifDescr']) . ' Bias Current'; - discover_sensor($valid['sensor'], 'current', $device, $oid, 'bias-' . $index, 'comware', $descr, $divisor, $multiplier, $limit_low, $warn_limit_low, $warn_limit, $limit, $current, 'snmp', $entPhysicalIndex, $entPhysicalIndex_measured); + discover_sensor(null, 'current', $device, $oid, 'bias-' . $index, 'comware', $descr, $divisor, $multiplier, $limit_low, $warn_limit_low, $warn_limit, $limit, $current, 'snmp', $entPhysicalIndex, $entPhysicalIndex_measured); } } diff --git a/includes/discovery/sensors/current/cyberpower.inc.php b/includes/discovery/sensors/current/cyberpower.inc.php index ac25bb6b9e..1c29f554b9 100644 --- a/includes/discovery/sensors/current/cyberpower.inc.php +++ b/includes/discovery/sensors/current/cyberpower.inc.php @@ -11,5 +11,5 @@ if ($oids) { $type = 'cyberpower'; $descr = 'Input'; $current = $current / 10; - discover_sensor($valid['sensor'], 'current', $device, $oid, '0', $type, $descr, $divisor, '1', null, null, null, null, $current); + discover_sensor(null, 'current', $device, $oid, '0', $type, $descr, $divisor, '1', null, null, null, null, $current); } diff --git a/includes/discovery/sensors/current/digipower.inc.php b/includes/discovery/sensors/current/digipower.inc.php index 621cf9cfbb..79a55ab8e3 100644 --- a/includes/discovery/sensors/current/digipower.inc.php +++ b/includes/discovery/sensors/current/digipower.inc.php @@ -11,5 +11,5 @@ if ($oids) { $type = 'digipower'; $descr = 'Input'; $current = $current / 10; - discover_sensor($valid['sensor'], 'current', $device, $oid, 0, $type, $descr, $divisor, 1, null, null, null, null, $current); + discover_sensor(null, 'current', $device, $oid, 0, $type, $descr, $divisor, 1, null, null, null, null, $current); } diff --git a/includes/discovery/sensors/current/eatonpdu.inc.php b/includes/discovery/sensors/current/eatonpdu.inc.php index a68020ca33..66eca2cd45 100644 --- a/includes/discovery/sensors/current/eatonpdu.inc.php +++ b/includes/discovery/sensors/current/eatonpdu.inc.php @@ -16,6 +16,6 @@ if (is_array($data)) { $cur_oid = '.1.3.6.1.4.1.534.6.6.7.6.4.1.3.'; foreach ($data as $index => $entry) { $i++; - discover_sensor($valid['sensor'], 'current', $device, $cur_oid . $index, $i, 'eatonpdu', $descr[$index]['outletName'], '1000', '1', null, null, null, null, $data[$index]['outletCurrent'], 'snmp', $index); + discover_sensor(null, 'current', $device, $cur_oid . $index, $i, 'eatonpdu', $descr[$index]['outletName'], '1000', '1', null, null, null, null, $data[$index]['outletCurrent'], 'snmp', $index); } } diff --git a/includes/discovery/sensors/current/eatonups.inc.php b/includes/discovery/sensors/current/eatonups.inc.php index e32577387b..c5de00786c 100644 --- a/includes/discovery/sensors/current/eatonups.inc.php +++ b/includes/discovery/sensors/current/eatonups.inc.php @@ -12,7 +12,7 @@ foreach ($oids as $current_id => $data) { $type = 'xups'; $index = '1.2.3.' . $current_id; - discover_sensor($valid['sensor'], 'current', $device, $current_oid, $index, $type, $descr, $divisor, '1', null, null, null, null, $current); + discover_sensor(null, 'current', $device, $current_oid, $index, $type, $descr, $divisor, '1', null, null, null, null, $current); } $oids = snmpwalk_cache_oid($device, 'xupsOutputCurrent', [], 'XUPS-MIB'); @@ -28,7 +28,7 @@ foreach ($oids as $current_id => $data) { $divisor = 1; $index = '4.4.1.3.' . $current_id; - discover_sensor($valid['sensor'], 'current', $device, $current_oid, $index, $type, $descr, $divisor, '1', null, null, null, null, $current); + discover_sensor(null, 'current', $device, $current_oid, $index, $type, $descr, $divisor, '1', null, null, null, null, $current); } $oids = snmpwalk_cache_oid($device, 'xupsInputCurrent', [], 'XUPS-MIB'); @@ -44,5 +44,5 @@ foreach ($oids as $current_id => $data) { $divisor = 1; $index = '3.4.1.3.' . $current_id; - discover_sensor($valid['sensor'], 'current', $device, $current_oid, $index, $type, $descr, $divisor, '1', null, null, null, null, $current); + discover_sensor(null, 'current', $device, $current_oid, $index, $type, $descr, $divisor, '1', null, null, null, null, $current); } diff --git a/includes/discovery/sensors/current/eltex-mes21xx.inc.php b/includes/discovery/sensors/current/eltex-mes21xx.inc.php index 0f2290816d..41257ff737 100644 --- a/includes/discovery/sensors/current/eltex-mes21xx.inc.php +++ b/includes/discovery/sensors/current/eltex-mes21xx.inc.php @@ -41,7 +41,7 @@ if ($oids) { $tmp = get_port_by_index_cache($device['device_id'], $ifIndex); $descr = $tmp['ifName']; discover_sensor( - $valid['sensor'], 'current', $device, $split, 'txbias' . $ifIndex, 'rlPhyTestTableTxBias', 'SfpTxBias-' . $descr, $divisor, '1', $low_limit, $low_warn_limit, $high_warn_limit, $high_limit, $value + null, 'current', $device, $split, 'txbias' . $ifIndex, 'rlPhyTestTableTxBias', 'SfpTxBias-' . $descr, $divisor, '1', $low_limit, $low_warn_limit, $high_warn_limit, $high_limit, $value ); } } diff --git a/includes/discovery/sensors/current/eltex-mes23xx.inc.php b/includes/discovery/sensors/current/eltex-mes23xx.inc.php index c51cfd0485..2189b08564 100644 --- a/includes/discovery/sensors/current/eltex-mes23xx.inc.php +++ b/includes/discovery/sensors/current/eltex-mes23xx.inc.php @@ -37,7 +37,7 @@ if ($pre_cache['eltex-mes23xx-sfp']) { $descr = $tmp['ifName']; $oid = '.1.3.6.1.4.1.89.90.1.2.1.3.' . $ifIndex . '.7'; discover_sensor( - $valid['sensor'], + null, 'current', $device, $oid, diff --git a/includes/discovery/sensors/current/eltex-mes24xx.inc.php b/includes/discovery/sensors/current/eltex-mes24xx.inc.php index 579e33c450..c0dc8349b3 100644 --- a/includes/discovery/sensors/current/eltex-mes24xx.inc.php +++ b/includes/discovery/sensors/current/eltex-mes24xx.inc.php @@ -46,7 +46,7 @@ if (! empty($eltexPhyTransceiverDiagnosticTable['txBiasCurrent'])) { $descr = get_port_by_index_cache($device['device_id'], $ifIndex)['ifName']; $oid = Oid::toNumeric('ELTEX-PHY-MIB::eltexPhyTransceiverDiagnosticCurrentValue.' . $ifIndex . '.3.1'); discover_sensor( - $valid['sensor'], + null, 'current', $device, $oid, diff --git a/includes/discovery/sensors/current/enlogic-pdu.inc.php b/includes/discovery/sensors/current/enlogic-pdu.inc.php index e3cc2defc3..b44e795bf2 100644 --- a/includes/discovery/sensors/current/enlogic-pdu.inc.php +++ b/includes/discovery/sensors/current/enlogic-pdu.inc.php @@ -35,7 +35,7 @@ foreach ($pre_cache['enlogic_pdu_input'] as $index => $data) { $high_warn = $data['pduInputPhaseConfigCurrentUpperWarningThreshold']; $current = $data['pduInputPhaseStatusCurrent']; if ($current > 0) { - discover_sensor($valid['sensor'], 'current', $device, $oid, $tmp_index, $type, $descr, $divisor, '1', $low_limit, $low_warn, $high_warn, $high_limit, $current); + discover_sensor(null, 'current', $device, $oid, $tmp_index, $type, $descr, $divisor, '1', $low_limit, $low_warn, $high_warn, $high_limit, $current); } } } @@ -53,7 +53,7 @@ foreach ($pre_cache['enlogic_pdu_circuit'] as $index => $data) { $high_warn = $data['pduCircuitBreakerConfigUpperWarningThreshold']; $current = $data['pduCircuitBreakerStatusCurrent']; if ($current > 0) { - discover_sensor($valid['sensor'], 'current', $device, $oid, $tmp_index, $type, $descr, $divisor, '1', $low_limit, $low_warn, $high_warn, $high_limit, $current); + discover_sensor(null, 'current', $device, $oid, $tmp_index, $type, $descr, $divisor, '1', $low_limit, $low_warn, $high_warn, $high_limit, $current); } } } diff --git a/includes/discovery/sensors/current/fs-net-pdu.inc.php b/includes/discovery/sensors/current/fs-net-pdu.inc.php index d40996e224..013b5de19d 100644 --- a/includes/discovery/sensors/current/fs-net-pdu.inc.php +++ b/includes/discovery/sensors/current/fs-net-pdu.inc.php @@ -25,5 +25,5 @@ $oid = '.1.3.6.1.4.1.30966.10.3.2.4.0'; $current = snmp_get($device, $oid, '-Oqv') / 10; if ($current > 0) { - discover_sensor($valid['sensor'], 'current', $device, $oid, 0, 'PDU L1', 'Current', 10, 1, null, null, null, null, $current); + discover_sensor(null, 'current', $device, $oid, 0, 'PDU L1', 'Current', 10, 1, null, null, null, null, $current); } diff --git a/includes/discovery/sensors/current/gamatronicups.inc.php b/includes/discovery/sensors/current/gamatronicups.inc.php index 3d5a81cbb6..25c94a680d 100644 --- a/includes/discovery/sensors/current/gamatronicups.inc.php +++ b/includes/discovery/sensors/current/gamatronicups.inc.php @@ -11,7 +11,7 @@ for ($i = 1; $i <= 3; $i++) { $warnlimit = null; $limit = null; - discover_sensor($valid['sensor'], 'current', $device, $current_oid, $index, $type, $descr, '1', '1', $lowlimit, null, null, null, $current); + discover_sensor(null, 'current', $device, $current_oid, $index, $type, $descr, '1', '1', $lowlimit, null, null, null, $current); } for ($i = 1; $i <= 3; $i++) { @@ -25,5 +25,5 @@ for ($i = 1; $i <= 3; $i++) { $warnlimit = null; $limit = null; - discover_sensor($valid['sensor'], 'current', $device, $current_oid, $index, $type, $descr, '1', '1', $lowlimit, null, null, null, $current); + discover_sensor(null, 'current', $device, $current_oid, $index, $type, $descr, '1', '1', $lowlimit, null, null, null, $current); } diff --git a/includes/discovery/sensors/current/geist-pdu.inc.php b/includes/discovery/sensors/current/geist-pdu.inc.php index d0ac5f9080..e1b197c29e 100644 --- a/includes/discovery/sensors/current/geist-pdu.inc.php +++ b/includes/discovery/sensors/current/geist-pdu.inc.php @@ -29,7 +29,7 @@ foreach ($pre_cache['geist_pdu_iec'] as $index => $data) { $descr = $data['ctrl3ChIECName'] . ' Phase A'; $oid = $current_oid . $index; if ($value > 0) { - discover_sensor($valid['sensor'], 'current', $device, $oid, 'ctrl3ChIECDeciAmpsA', 'geist-pdu', $descr, $divisor, 1, null, null, null, null, $value); + discover_sensor(null, 'current', $device, $oid, 'ctrl3ChIECDeciAmpsA', 'geist-pdu', $descr, $divisor, 1, null, null, null, null, $value); } $divisor = 10; @@ -38,7 +38,7 @@ foreach ($pre_cache['geist_pdu_iec'] as $index => $data) { $descr = $data['ctrl3ChIECName'] . ' Phase B'; $oid = $current_oid . $index; if ($value > 0) { - discover_sensor($valid['sensor'], 'current', $device, $oid, 'ctrl3ChIECDeciAmpsB', 'geist-pdu', $descr, $divisor, 1, null, null, null, null, $value); + discover_sensor(null, 'current', $device, $oid, 'ctrl3ChIECDeciAmpsB', 'geist-pdu', $descr, $divisor, 1, null, null, null, null, $value); } $divisor = 10; @@ -47,6 +47,6 @@ foreach ($pre_cache['geist_pdu_iec'] as $index => $data) { $descr = $data['ctrl3ChIECName'] . ' Phase C'; $oid = $current_oid . $index; if ($value > 0) { - discover_sensor($valid['sensor'], 'current', $device, $oid, 'ctrl3ChIECDeciAmpsC', 'geist-pdu', $descr, $divisor, 1, null, null, null, null, $value); + discover_sensor(null, 'current', $device, $oid, 'ctrl3ChIECDeciAmpsC', 'geist-pdu', $descr, $divisor, 1, null, null, null, null, $value); } } diff --git a/includes/discovery/sensors/current/ict-pdu.inc.php b/includes/discovery/sensors/current/ict-pdu.inc.php index 5888cccb7a..61050d7c22 100644 --- a/includes/discovery/sensors/current/ict-pdu.inc.php +++ b/includes/discovery/sensors/current/ict-pdu.inc.php @@ -39,7 +39,7 @@ foreach ($oids as $index => $entry) { $type = 'ict-pdu'; $current = (float) $entry['outputCurrent'] / $divisor; - discover_sensor($valid['sensor'], 'current', $device, $oid, $index, $type, $descr, $divisor, '1', null, null, null, null, $current); + discover_sensor(null, 'current', $device, $oid, $index, $type, $descr, $divisor, '1', null, null, null, null, $current); } // System Current @@ -52,5 +52,5 @@ if (! empty($systemCurrent)) { $oid = '.1.3.6.1.4.1.39145.10.7.0'; $current = $systemCurrent / $divisor; - discover_sensor($valid['sensor'], 'current', $device, $oid, $index, $type, $descr, $divisor, '1', null, null, null, null, $current); + discover_sensor(null, 'current', $device, $oid, $index, $type, $descr, $divisor, '1', null, null, null, null, $current); } diff --git a/includes/discovery/sensors/current/ict-psu.inc.php b/includes/discovery/sensors/current/ict-psu.inc.php index 41497d459d..d36f2f918d 100644 --- a/includes/discovery/sensors/current/ict-psu.inc.php +++ b/includes/discovery/sensors/current/ict-psu.inc.php @@ -35,5 +35,5 @@ if (! empty($outputCurrent)) { $type = 'ict-psu'; $currentValue = $outputCurrent / $divisor; - discover_sensor($valid['sensor'], 'current', $device, $oid, $index, $type, $descr, $divisor, '1', null, null, null, null, $currentValue); + discover_sensor(null, 'current', $device, $oid, $index, $type, $descr, $divisor, '1', null, null, null, null, $currentValue); } diff --git a/includes/discovery/sensors/current/ipoman.inc.php b/includes/discovery/sensors/current/ipoman.inc.php index 9bb12252a8..7f1fb065b5 100644 --- a/includes/discovery/sensors/current/ipoman.inc.php +++ b/includes/discovery/sensors/current/ipoman.inc.php @@ -22,7 +22,7 @@ if (is_array($oids_in)) { $current = ($entry['inletStatusCurrent'] / $divisor); $high_limit = ($entry['inletConfigCurrentHigh'] / 10); - discover_sensor($valid['sensor'], 'current', $device, $cur_oid, '1.3.1.3.' . $index, 'ipoman', $descr, $divisor, '1', null, null, null, $high_limit, $current); + discover_sensor(null, 'current', $device, $cur_oid, '1.3.1.3.' . $index, 'ipoman', $descr, $divisor, '1', null, null, null, $high_limit, $current); // FIXME: iPoMan 1201 also says it has 2 inlets, at least until firmware 1.06 - wtf? } } @@ -35,6 +35,6 @@ if (is_array($oids_out)) { $current = ($entry['outletStatusCurrent'] / $divisor); $high_limit = ($entry['outletConfigCurrentHigh'] / 10); - discover_sensor($valid['sensor'], 'current', $device, $cur_oid, '2.3.1.3.' . $index, 'ipoman', $descr, $divisor, '1', null, null, null, $high_limit, $current); + discover_sensor(null, 'current', $device, $cur_oid, '2.3.1.3.' . $index, 'ipoman', $descr, $divisor, '1', null, null, null, $high_limit, $current); } } diff --git a/includes/discovery/sensors/current/liebert.inc.php b/includes/discovery/sensors/current/liebert.inc.php index 4f49aea4ac..b46bb48cd2 100644 --- a/includes/discovery/sensors/current/liebert.inc.php +++ b/includes/discovery/sensors/current/liebert.inc.php @@ -51,7 +51,7 @@ foreach (array_keys($psline_data) as $index) { $current = $psline_data[$index]['lgpPduPsLineEntryEcHundredths']; discover_sensor( - $valid['sensor'], + null, $class, $device, $oid, @@ -94,7 +94,7 @@ foreach (array_keys($ps_data) as $index) { $current = $ps_data[$index]['lgpPduPsEntryEcNeutral']; discover_sensor( - $valid['sensor'], + null, $class, $device, $oid, @@ -139,7 +139,7 @@ foreach (array_keys($rb_data) as $index) { $group = 'Line to Neutral'; discover_sensor( - $valid['sensor'], + null, $class, $device, $oid, diff --git a/includes/discovery/sensors/current/linux.inc.php b/includes/discovery/sensors/current/linux.inc.php index 8b999c637c..16ea6f2a70 100644 --- a/includes/discovery/sensors/current/linux.inc.php +++ b/includes/discovery/sensors/current/linux.inc.php @@ -11,18 +11,18 @@ if (preg_match('/(Linux).+(ntc)/', $device['sysDescr'])) { $current = '116.3'; $value = snmp_get($device, $oid . $current, '-Oqv'); if (is_numeric($value)) { - discover_sensor($valid['sensor'], 'current', $device, $oid . $current, $current, $sensor_type, $descr, '1', '1', $lowlimit, $lowwarnlimit, $warnlimit, $limit, $value); + discover_sensor(null, 'current', $device, $oid . $current, $current, $sensor_type, $descr, '1', '1', $lowlimit, $lowwarnlimit, $warnlimit, $limit, $value); } $descr = 'VBUS current'; $current = '116.5'; $value = snmp_get($device, $oid . $current, '-Oqv'); if (is_numeric($value)) { - discover_sensor($valid['sensor'], 'current', $device, $oid . $current, $current, $sensor_type, $descr, '1', '1', $lowlimit, $lowwarnlimit, $warnlimit, $limit, $value); + discover_sensor(null, 'current', $device, $oid . $current, $current, $sensor_type, $descr, '1', '1', $lowlimit, $lowwarnlimit, $warnlimit, $limit, $value); } $descr = 'Battery current'; $current = '116.7'; $value = snmp_get($device, $oid . $current, '-Oqv'); if (is_numeric($value)) { - discover_sensor($valid['sensor'], 'current', $device, $oid . $current, $current, $sensor_type, $descr, '1', '1', $lowlimit, $lowwarnlimit, $warnlimit, $limit, $value); + discover_sensor(null, 'current', $device, $oid . $current, $current, $sensor_type, $descr, '1', '1', $lowlimit, $lowwarnlimit, $warnlimit, $limit, $value); } } diff --git a/includes/discovery/sensors/current/mgeups.inc.php b/includes/discovery/sensors/current/mgeups.inc.php index a16a81bcf5..97e2dc9c86 100644 --- a/includes/discovery/sensors/current/mgeups.inc.php +++ b/includes/discovery/sensors/current/mgeups.inc.php @@ -28,7 +28,7 @@ for ($i = 1; $i <= $numPhase; $i++) { $limit = null; $lowwarnlimit = null; - discover_sensor($valid['sensor'], 'current', $device, $current_oid, $index, $type, $descr, '10', '1', $lowlimit, $lowwarnlimit, $warnlimit, $limit, $current); + discover_sensor(null, 'current', $device, $current_oid, $index, $type, $descr, '10', '1', $lowlimit, $lowwarnlimit, $warnlimit, $limit, $current); }//end for $oids = trim(snmp_walk($device, '.1.3.6.1.4.1.705.1.6.2.1.6', '-OsqnU')); // OID: mginputCurrent @@ -58,5 +58,5 @@ for ($i = 1; $i <= $numPhase; $i++) { $limit = null; $lowwarnlimit = null; - discover_sensor($valid['sensor'], 'current', $device, $current_oid, $index, $type, $descr, '10', '1', $lowlimit, $lowwarnlimit, $warnlimit, $limit, $current); + discover_sensor(null, 'current', $device, $current_oid, $index, $type, $descr, '10', '1', $lowlimit, $lowwarnlimit, $warnlimit, $limit, $current); }//end for diff --git a/includes/discovery/sensors/current/netagent2.inc.php b/includes/discovery/sensors/current/netagent2.inc.php index b0109fc2d9..74ecaf7bff 100644 --- a/includes/discovery/sensors/current/netagent2.inc.php +++ b/includes/discovery/sensors/current/netagent2.inc.php @@ -37,7 +37,7 @@ if (! empty($battery_current) || $battery_current == 0) { $descr = 'Battery Current'; discover_sensor( - $valid['sensor'], + null, 'current', $device, $battery_current_oid, diff --git a/includes/discovery/sensors/current/netonix.inc.php b/includes/discovery/sensors/current/netonix.inc.php index e4ce81837e..ede558e979 100644 --- a/includes/discovery/sensors/current/netonix.inc.php +++ b/includes/discovery/sensors/current/netonix.inc.php @@ -30,5 +30,5 @@ $descr = 'DC Input Current'; $divisor = 10; if (is_numeric($dcinput_value) && $dcinput_value > 0) { - discover_sensor($valid['sensor'], 'current', $device, $dcinput_oid, 0, $device['os'], $descr, $divisor, 1, null, null, null, null, $dcinput_value / $divisor); + discover_sensor(null, 'current', $device, $dcinput_oid, 0, $device['os'], $descr, $divisor, 1, null, null, null, null, $dcinput_value / $divisor); } diff --git a/includes/discovery/sensors/current/netvision.inc.php b/includes/discovery/sensors/current/netvision.inc.php index 44e05d85f6..be114ff985 100644 --- a/includes/discovery/sensors/current/netvision.inc.php +++ b/includes/discovery/sensors/current/netvision.inc.php @@ -11,7 +11,7 @@ for ($i = 1; $i <= 3; $i++) { $warnlimit = null; $limit = null; - discover_sensor($valid['sensor'], 'current', $device, $current_oid, $index, $type, $descr, '10', '1', $lowlimit, null, null, null, $current); + discover_sensor(null, 'current', $device, $current_oid, $index, $type, $descr, '10', '1', $lowlimit, null, null, null, $current); } for ($i = 1; $i <= 3; $i++) { @@ -25,5 +25,5 @@ for ($i = 1; $i <= 3; $i++) { $warnlimit = null; $limit = null; - discover_sensor($valid['sensor'], 'current', $device, $current_oid, $index, $type, $descr, '10', '1', $lowlimit, null, null, null, $current); + discover_sensor(null, 'current', $device, $current_oid, $index, $type, $descr, '10', '1', $lowlimit, null, null, null, $current); } diff --git a/includes/discovery/sensors/current/pbn.inc.php b/includes/discovery/sensors/current/pbn.inc.php index fbf5c724a2..9b8fb602ab 100644 --- a/includes/discovery/sensors/current/pbn.inc.php +++ b/includes/discovery/sensors/current/pbn.inc.php @@ -26,6 +26,6 @@ foreach ($pre_cache['pbn_oids'] as $index => $entry) { $value = $entry['curr'] / $divisor; $entPhysicalIndex = $index; $entPhysicalIndex_measured = 'ports'; - discover_sensor($valid['sensor'], 'current', $device, $oid, '' . $index, 'pbn', $descr, $divisor, $multiplier, $limit_low, $warn_limit_low, $warn_limit, $limit, $value, 'snmp', $entPhysicalIndex, $entPhysicalIndex_measured); + discover_sensor(null, 'current', $device, $oid, '' . $index, 'pbn', $descr, $divisor, $multiplier, $limit_low, $warn_limit_low, $warn_limit, $limit, $value, 'snmp', $entPhysicalIndex, $entPhysicalIndex_measured); } } diff --git a/includes/discovery/sensors/current/powerlogic.inc.php b/includes/discovery/sensors/current/powerlogic.inc.php index 3048c54d9d..43786584a6 100644 --- a/includes/discovery/sensors/current/powerlogic.inc.php +++ b/includes/discovery/sensors/current/powerlogic.inc.php @@ -29,7 +29,7 @@ if (is_numeric($data['lcIa'][1])) { $index = 'lcIa'; $descr = 'Phase A'; $current = $data['lcIa'][1]; - discover_sensor($valid['sensor'], 'current', $device, $current_oid, $index, 'powerlogic', $descr, 1, 1, null, null, null, null, $current); + discover_sensor(null, 'current', $device, $current_oid, $index, 'powerlogic', $descr, 1, 1, null, null, null, null, $current); } if (is_numeric($data['lcIb'][1])) { @@ -37,7 +37,7 @@ if (is_numeric($data['lcIb'][1])) { $index = 'lcIb'; $descr = 'Phase B'; $current = $data['lcIb'][1]; - discover_sensor($valid['sensor'], 'current', $device, $current_oid, $index, 'powerlogic', $descr, 1, 1, null, null, null, null, $current); + discover_sensor(null, 'current', $device, $current_oid, $index, 'powerlogic', $descr, 1, 1, null, null, null, null, $current); } if (is_numeric($data['lcIc'][1])) { @@ -45,7 +45,7 @@ if (is_numeric($data['lcIc'][1])) { $index = 'lcIc'; $descr = 'Phase C'; $current = $data['lcIc'][1]; - discover_sensor($valid['sensor'], 'current', $device, $current_oid, $index, 'powerlogic', $descr, 1, 1, null, null, null, null, $current); + discover_sensor(null, 'current', $device, $current_oid, $index, 'powerlogic', $descr, 1, 1, null, null, null, null, $current); } unset($data); diff --git a/includes/discovery/sensors/current/procurve.inc.php b/includes/discovery/sensors/current/procurve.inc.php index ea29751983..4497dc5e30 100644 --- a/includes/discovery/sensors/current/procurve.inc.php +++ b/includes/discovery/sensors/current/procurve.inc.php @@ -16,7 +16,7 @@ foreach ($pre_cache['procurve_hpicfXcvrInfoTable'] as $index => $entry) { $entPhysicalIndex_measured = 'ports'; foreach ($dbquery as $dbindex => $dbresult) { $descr = makeshortif($dbresult['ifDescr']) . ' Port Bias Current'; - discover_sensor($valid['sensor'], 'current', $device, $oid, 'hpicfXcvrBias.' . $index, 'procurve', $descr, $divisor, $multiplier, $limit_low, $warn_limit_low, $warn_limit, $limit, $current, 'snmp', $entPhysicalIndex, $entPhysicalIndex_measured); + discover_sensor(null, 'current', $device, $oid, 'hpicfXcvrBias.' . $index, 'procurve', $descr, $divisor, $multiplier, $limit_low, $warn_limit_low, $warn_limit, $limit, $current, 'snmp', $entPhysicalIndex, $entPhysicalIndex_measured); } } } diff --git a/includes/discovery/sensors/current/raritan-pdu.inc.php b/includes/discovery/sensors/current/raritan-pdu.inc.php index 2009860d7d..847de2bbc1 100644 --- a/includes/discovery/sensors/current/raritan-pdu.inc.php +++ b/includes/discovery/sensors/current/raritan-pdu.inc.php @@ -18,7 +18,7 @@ if ($inlet_oids) { $inlet_divisor = pow(10, snmp_get($device, "inletSensorDecimalDigits.$inlet_index.rmsCurrent", '-Ovq', 'PDU2-MIB')); $inlet_current = (snmp_get($device, "measurementsInletSensorValue.$inlet_index.1", '-Ovq', 'PDU2-MIB') / $inlet_divisor); if ($inlet_current >= 0) { - discover_sensor($valid['sensor'], 'current', $device, $inlet_oid, $inlet_index, 'raritan', $inlet_descr, $inlet_divisor, $multiplier, null, null, null, null, $inlet_current); + discover_sensor(null, 'current', $device, $inlet_oid, $inlet_index, 'raritan', $inlet_descr, $inlet_divisor, $multiplier, null, null, null, null, $inlet_current); } } } @@ -46,7 +46,7 @@ if ($outlet_oids) { $outlet_high_limit = snmp_get($device, "outletCurrentUpperCritical.$outletsuffix", '-Ovq', 'PDU-MIB') / $divisor; $outlet_current = snmp_get($device, "outletCurrent.$outletsuffix", '-Ovq', 'PDU-MIB') / $divisor; if ($outlet_current >= 0) { - discover_sensor($valid['sensor'], 'current', $device, $outlet_oid, $outlet_insert_index, 'raritan', $outlet_descr, $divisor, $multiplier, $outlet_low_limit, $outlet_low_warn_limit, $outlet_high_warn_limit, $outlet_high_limit, $outlet_current); + discover_sensor(null, 'current', $device, $outlet_oid, $outlet_insert_index, 'raritan', $outlet_descr, $divisor, $multiplier, $outlet_low_limit, $outlet_low_warn_limit, $outlet_high_warn_limit, $outlet_high_limit, $outlet_current); } } } @@ -77,7 +77,7 @@ if ($outlet_oids) { $outlet_divisor = pow(10, snmp_get($device, "outletSensorDecimalDigits.1.$outlet_index.rmsCurrent", '-Ovq', 'PDU2-MIB')); $outlet_power = (snmp_get($device, "measurementsOutletSensorValue.1.$outlet_index.1", '-Ovq', 'PDU2-MIB') / $outlet_divisor); if ($outlet_power >= 0) { - discover_sensor($valid['sensor'], 'current', $device, $outlet_oid, $outlet_insert_index, 'raritan', $outlet_descr, $outlet_divisor, $multiplier, $outlet_low_limit, $outlet_low_warn_limit, $outlet_high_warn_limit, $outlet_high_limit, $outlet_power); + discover_sensor(null, 'current', $device, $outlet_oid, $outlet_insert_index, 'raritan', $outlet_descr, $outlet_divisor, $multiplier, $outlet_low_limit, $outlet_low_warn_limit, $outlet_high_warn_limit, $outlet_high_limit, $outlet_power); } } } @@ -118,6 +118,6 @@ foreach ($pre_cache['raritan_inletTable'] as $index => $raritan_data) { $warn_limit = $raritan_data['inletCurrentLowerWarning'] / $divisor; $high_limit = $raritan_data['inletCurrentLowerCritical'] / $divisor; $current = $pre_cache['raritan_inletPoleTable'][$index][$x]['inletPoleCurrent'] / $divisor; - discover_sensor($valid['sensor'], 'current', $device, $oid, $tmp_index, 'raritan', $descr, $divisor, 1, $low_limit, $low_limit, $warn_limit, $high_limit, $current); + discover_sensor(null, 'current', $device, $oid, $tmp_index, 'raritan', $descr, $divisor, 1, $low_limit, $low_limit, $warn_limit, $high_limit, $current); } } diff --git a/includes/discovery/sensors/current/rfc1628.inc.php b/includes/discovery/sensors/current/rfc1628.inc.php index 749deff462..5b2af0f296 100644 --- a/includes/discovery/sensors/current/rfc1628.inc.php +++ b/includes/discovery/sensors/current/rfc1628.inc.php @@ -11,7 +11,7 @@ if (is_numeric($battery_current)) { $divisor = get_device_divisor($device, $pre_cache['poweralert_serial'] ?? '', 'current', $oid); discover_sensor( - $valid['sensor'], + null, 'current', $device, $oid, @@ -43,7 +43,7 @@ foreach ($output_current as $index => $data) { $data['upsOutputCurrent'] = Number::cast($data['upsOutputCurrent']); discover_sensor( - $valid['sensor'], + null, 'current', $device, $oid, @@ -75,7 +75,7 @@ foreach ($input_current as $index => $data) { $data['upsInputCurrent'] = Number::cast($data['upsInputCurrent']); discover_sensor( - $valid['sensor'], + null, 'current', $device, $oid, @@ -107,7 +107,7 @@ foreach ($bypass_current as $index => $data) { $data['upsBypassCurrent'] = Number::cast($data['upsBypassCurrent']); discover_sensor( - $valid['sensor'], + null, 'current', $device, $oid, diff --git a/includes/discovery/sensors/current/schleifenbauer.inc.php b/includes/discovery/sensors/current/schleifenbauer.inc.php index fbd34f61ae..c3c98ddd7f 100644 --- a/includes/discovery/sensors/current/schleifenbauer.inc.php +++ b/includes/discovery/sensors/current/schleifenbauer.inc.php @@ -16,7 +16,7 @@ foreach ($pre_cache['sdbMgmtCtrlDevUnitAddress'] ?? [] as $sdbMgmtCtrlDevUnitAdd // See includes/discovery/entity-physical/schleifenbauer.inc.php for an explanation why we set this as the entPhysicalIndex. $entPhysicalIndex = $sdbMgmtCtrlDevUnitAddress * 1000000 + 100000 + $sdbDevInIndex * 1000 + 120; - discover_sensor($valid['sensor'], 'current', $device, $current_oid, $serial_input, 'schleifenbauer', $descr, $divisor, '1', null, null, $warn_limit, $high_limit, $current, 'snmp', $entPhysicalIndex); + discover_sensor(null, 'current', $device, $current_oid, $serial_input, 'schleifenbauer', $descr, $divisor, '1', null, null, $warn_limit, $high_limit, $current, 'snmp', $entPhysicalIndex); } } @@ -33,5 +33,5 @@ foreach ($pre_cache['sdbDevOutMtActualCurrent'] ?? [] as $sdbDevOutMtIndex => $s // See includes/discovery/entity-physical/schleifenbauer.inc.php for an explanation why we set this as the entPhysicalIndex. $entPhysicalIndex = $sdbMgmtCtrlDevUnitAddress * 1000000 + 200000 + $sdbDevOutMtIndex * 1000 + 120; - discover_sensor($valid['sensor'], 'current', $device, $current_oid, $serial_output, 'schleifenbauer', $descr, $divisor, '1', null, null, $warn_limit, $high_limit, $current, 'snmp', $entPhysicalIndex); + discover_sensor(null, 'current', $device, $current_oid, $serial_output, 'schleifenbauer', $descr, $divisor, '1', null, null, $warn_limit, $high_limit, $current, 'snmp', $entPhysicalIndex); } diff --git a/includes/discovery/sensors/current/sinetica.inc.php b/includes/discovery/sensors/current/sinetica.inc.php index ad24f74114..b34d1452e0 100644 --- a/includes/discovery/sensors/current/sinetica.inc.php +++ b/includes/discovery/sensors/current/sinetica.inc.php @@ -32,7 +32,7 @@ if (! empty($battery_current) || $battery_current == 0) { $type = 'sinetica'; $index = '2.6.0'; - discover_sensor($valid['sensor'], 'current', $device, $battery_oid, $index, $type, $descr, $divisor, '1', null, null, null, null, $current); + discover_sensor(null, 'current', $device, $battery_oid, $index, $type, $descr, $divisor, '1', null, null, null, null, $current); } $oids = snmpwalk_cache_oid_num($device, '.1.3.6.1.4.1.13891.101.4.4.1.3', []); @@ -50,7 +50,7 @@ foreach ($oids as $oid => $data) { $type = 'sinetica'; $index = '4.4.1.3.' . $current_id; - discover_sensor($valid['sensor'], 'current', $device, $current_oid, $index, $type, $descr, $divisor, '1', null, null, null, null, $current); + discover_sensor(null, 'current', $device, $current_oid, $index, $type, $descr, $divisor, '1', null, null, null, null, $current); } $oids = snmpwalk_cache_oid_num($device, '.1.3.6.1.4.1.13891.101.3.3.1.4', []); @@ -68,5 +68,5 @@ foreach ($oids as $oid => $data) { $type = 'sinetica'; $index = '3.3.1.3.' . $current_id; - discover_sensor($valid['sensor'], 'current', $device, $current_oid, $index, $type, $descr, $divisor, '1', null, null, null, null, $current); + discover_sensor(null, 'current', $device, $current_oid, $index, $type, $descr, $divisor, '1', null, null, null, null, $current); } diff --git a/includes/discovery/sensors/current/sitemonitor.inc.php b/includes/discovery/sensors/current/sitemonitor.inc.php index 759eae3fab..0da75e5d0c 100644 --- a/includes/discovery/sensors/current/sitemonitor.inc.php +++ b/includes/discovery/sensors/current/sitemonitor.inc.php @@ -25,5 +25,5 @@ $oid = '.1.3.6.1.4.1.32050.2.1.27.5.4'; $current = (snmp_get($device, $oid, '-Oqv') / 10); if ($current > 0) { - discover_sensor($valid['sensor'], 'current', $device, $oid, 0, 'sitemonitor', 'Current', 10, 1, null, null, null, null, $current); + discover_sensor(null, 'current', $device, $oid, 0, 'sitemonitor', 'Current', 10, 1, null, null, null, null, $current); } diff --git a/includes/discovery/sensors/current/tpdin.inc.php b/includes/discovery/sensors/current/tpdin.inc.php index 99e8b7ea09..e0b2996d93 100644 --- a/includes/discovery/sensors/current/tpdin.inc.php +++ b/includes/discovery/sensors/current/tpdin.inc.php @@ -51,7 +51,7 @@ $tpdin_oids = [ foreach ($tpdin_oids as $data) { if ($data['current'] > 0) { - discover_sensor($valid['sensor'], 'current', $device, $data['oid'], $data['index'], $device['os'], $data['descr'], 10, '1', null, null, null, null, $data['current']); + discover_sensor(null, 'current', $device, $data['oid'], $data['index'], $device['os'], $data['descr'], 10, '1', null, null, null, null, $data['current']); } } diff --git a/includes/discovery/sensors/dbm/adva_fsp150.inc.php b/includes/discovery/sensors/dbm/adva_fsp150.inc.php index ed513af650..776d50b151 100644 --- a/includes/discovery/sensors/dbm/adva_fsp150.inc.php +++ b/includes/discovery/sensors/dbm/adva_fsp150.inc.php @@ -50,7 +50,7 @@ foreach ($pre_cache['adva_fsp150_ports'] as $index => $entry) { $entPhysicalIndex_measured = 'ports'; $descrRx = ($pre_cache['adva_fsp150_ifName'][$entry['cmEthernetNetPortIfIndex']]['ifName'] ?? 'ifIndex ' . $entry['cmEthernetNetPortIfIndex']) . ' Rx Power'; discover_sensor( - $valid['sensor'], + null, 'dbm', $device, $oidRx, @@ -72,7 +72,7 @@ foreach ($pre_cache['adva_fsp150_ports'] as $index => $entry) { // Discover transmit power level $descrTx = ($pre_cache['adva_fsp150_ifName'][$entry['cmEthernetNetPortIfIndex']]['ifName'] ?? 'ifIndex ' . $entry['cmEthernetNetPortIfIndex']) . ' Tx Power'; discover_sensor( - $valid['sensor'], + null, 'dbm', $device, $oidTx, @@ -107,7 +107,7 @@ foreach ($pre_cache['adva_fsp150_ports'] as $index => $entry) { $descrRx = ($pre_cache['adva_fsp150_ifName'][$entry['cmEthernetAccPortIfIndex']]['ifName'] ?? 'ifIndex ' . $entry['cmEthernetAccPortIfIndex']) . ' Rx Power'; discover_sensor( - $valid['sensor'], + null, 'dbm', $device, $oidRx, @@ -129,7 +129,7 @@ foreach ($pre_cache['adva_fsp150_ports'] as $index => $entry) { $descrTx = ($pre_cache['adva_fsp150_ifName'][$entry['cmEthernetAccPortIfIndex']]['ifName'] ?? 'ifIndex ' . $entry['cmEthernetAccPortIfIndex']) . ' Tx Power'; discover_sensor( - $valid['sensor'], + null, 'dbm', $device, $oidTx, @@ -163,7 +163,7 @@ foreach ($pre_cache['adva_fsp150_ports'] as $index => $entry) { $entPhysicalIndex_measured = 'ports'; $descrRx = ($pre_cache['adva_fsp150_ifName'][$entry['cmEthernetTrafficPortIfIndex']]['ifName'] ?? 'ifIndex ' . $entry['cmEthernetTrafficPortIfIndex']) . ' Rx Power'; discover_sensor( - $valid['sensor'], + null, 'dbm', $device, $oidRx, @@ -184,7 +184,7 @@ foreach ($pre_cache['adva_fsp150_ports'] as $index => $entry) { $descrTx = ($pre_cache['adva_fsp150_ifName'][$entry['cmEthernetTrafficPortIfIndex']]['ifName'] ?? 'ifIndex ' . $entry['cmEthernetTrafficPortIfIndex']) . ' Tx Power'; discover_sensor( - $valid['sensor'], + null, 'dbm', $device, $oidTx, diff --git a/includes/discovery/sensors/dbm/adva_fsp3kr7.inc.php b/includes/discovery/sensors/dbm/adva_fsp3kr7.inc.php index 376348aeff..61839cde40 100644 --- a/includes/discovery/sensors/dbm/adva_fsp3kr7.inc.php +++ b/includes/discovery/sensors/dbm/adva_fsp3kr7.inc.php @@ -29,7 +29,7 @@ foreach ($pre_cache['adva_fsp3kr7'] as $index => $entry) { $descr = $entry['entityFacilityAidString'] . ' RX'; discover_sensor( - $valid['sensor'], + null, 'dbm', $device, $oidRX, @@ -52,7 +52,7 @@ foreach ($pre_cache['adva_fsp3kr7'] as $index => $entry) { $currentTX = $entry['pmSnapshotCurrentOutputPower'] / $divisor; discover_sensor( - $valid['sensor'], + null, 'dbm', $device, $oidTX, diff --git a/includes/discovery/sensors/dbm/awplus.inc.php b/includes/discovery/sensors/dbm/awplus.inc.php index 005553963d..88311dd7d2 100644 --- a/includes/discovery/sensors/dbm/awplus.inc.php +++ b/includes/discovery/sensors/dbm/awplus.inc.php @@ -15,7 +15,7 @@ if ($pre_cache['awplus-sfpddm']) { $descr = $tmp['ifName']; $oid = '.1.3.6.1.4.1.207.8.4.4.3.28.1.4.1.3.' . $index; discover_sensor( - $valid['sensor'], + null, 'dbm', $device, $oid, @@ -51,7 +51,7 @@ if ($pre_cache['awplus-sfpddm']) { $descr = $tmp['ifName']; $oid = '.1.3.6.1.4.1.207.8.4.4.3.28.1.5.1.3.' . $index; discover_sensor( - $valid['sensor'], + null, 'dbm', $device, $oid, diff --git a/includes/discovery/sensors/dbm/ciscoepc.inc.php b/includes/discovery/sensors/dbm/ciscoepc.inc.php index 2580347db5..bfc4d02e5f 100644 --- a/includes/discovery/sensors/dbm/ciscoepc.inc.php +++ b/includes/discovery/sensors/dbm/ciscoepc.inc.php @@ -28,6 +28,6 @@ foreach ($pre_cache['ciscoepc_docsIfDownstreamChannelTable'] as $index => $data) $oid = '.1.3.6.1.2.1.10.127.1.1.1.1.6.' . $index; $divisor = 10; $value = $data['docsIfDownChannelPower']; - discover_sensor($valid['sensor'], 'dbm', $device, $oid, 'docsIfDownChannelPower.' . $index, 'ciscoepc', $descr, $divisor, '1', null, null, null, null, $value); + discover_sensor(null, 'dbm', $device, $oid, 'docsIfDownChannelPower.' . $index, 'ciscoepc', $descr, $divisor, '1', null, null, null, null, $value); } } diff --git a/includes/discovery/sensors/dbm/ciscosb.inc.php b/includes/discovery/sensors/dbm/ciscosb.inc.php index cc54ec00fa..c675cd6695 100644 --- a/includes/discovery/sensors/dbm/ciscosb.inc.php +++ b/includes/discovery/sensors/dbm/ciscosb.inc.php @@ -24,7 +24,7 @@ foreach ($pre_cache['ciscosb_rlPhyTestGetResult'] as $index => $ciscosb_data) { $dbm = $value['rlPhyTestTableTxOutput'] / $divisor; $entPhysicalIndex = $index; $entPhysicalIndex_measured = 'ports'; - discover_sensor($valid['sensor'], 'dbm', $device, $oid, 'tx-' . $index, $sensor_type, $descr, $divisor, $multiplier, null, null, null, null, $dbm, 'snmp', $entPhysicalIndex, $entPhysicalIndex_measured); + discover_sensor(null, 'dbm', $device, $oid, 'tx-' . $index, $sensor_type, $descr, $divisor, $multiplier, null, null, null, null, $dbm, 'snmp', $entPhysicalIndex, $entPhysicalIndex_measured); } if (isset($value['rlPhyTestTableRxOpticalPower']) && is_numeric($value['rlPhyTestTableRxOpticalPower']) && ($value['rlPhyTestTableTxOutput'] != 0)) { $oid = '.1.3.6.1.4.1.9.6.1.101.90.1.2.1.3.' . $index . '.9'; @@ -34,7 +34,7 @@ foreach ($pre_cache['ciscosb_rlPhyTestGetResult'] as $index => $ciscosb_data) { $dbm = $value['rlPhyTestTableRxOpticalPower'] / $divisor; $entPhysicalIndex = $index; $entPhysicalIndex_measured = 'ports'; - discover_sensor($valid['sensor'], 'dbm', $device, $oid, 'rx-' . $index, $sensor_type, $descr, $divisor, $multiplier, null, null, null, null, $dbm, 'snmp', $entPhysicalIndex, $entPhysicalIndex_measured); + discover_sensor(null, 'dbm', $device, $oid, 'rx-' . $index, $sensor_type, $descr, $divisor, $multiplier, null, null, null, null, $dbm, 'snmp', $entPhysicalIndex, $entPhysicalIndex_measured); } } } diff --git a/includes/discovery/sensors/dbm/comware.inc.php b/includes/discovery/sensors/dbm/comware.inc.php index f40fe1e7c7..4df9752888 100644 --- a/includes/discovery/sensors/dbm/comware.inc.php +++ b/includes/discovery/sensors/dbm/comware.inc.php @@ -31,7 +31,7 @@ foreach ($pre_cache['comware_oids'] as $index => $entry) { $entPhysicalIndex = $index; $entPhysicalIndex_measured = 'ports'; $descr = makeshortif($interface['ifDescr']) . ' Receive Power'; - discover_sensor($valid['sensor'], 'dbm', $device, $oid, 'rx-' . $index, 'comware', $descr, $divisor, $multiplier, $limit_low, $warn_limit_low, $warn_limit, $limit, $current, 'snmp', $entPhysicalIndex, $entPhysicalIndex_measured); + discover_sensor(null, 'dbm', $device, $oid, 'rx-' . $index, 'comware', $descr, $divisor, $multiplier, $limit_low, $warn_limit_low, $warn_limit, $limit, $current, 'snmp', $entPhysicalIndex, $entPhysicalIndex_measured); } if (is_numeric($entry['hh3cTransceiverCurTXPower']) && $entry['hh3cTransceiverCurTXPower'] != 2147483647 && isset($entry['hh3cTransceiverDiagnostic'])) { @@ -46,7 +46,7 @@ foreach ($pre_cache['comware_oids'] as $index => $entry) { $interface = get_port_by_index_cache($device['device_id'], $index); if ($interface['ifAdminStatus'] == 'up') { $descr = makeshortif($interface['ifDescr']) . ' Transmit Power'; - discover_sensor($valid['sensor'], 'dbm', $device, $oid, 'tx-' . $index, 'comware', $descr, $divisor, $multiplier, $limit_low, $warn_limit_low, $warn_limit, $limit, $current, 'snmp', $entPhysicalIndex, $entPhysicalIndex_measured); + discover_sensor(null, 'dbm', $device, $oid, 'tx-' . $index, 'comware', $descr, $divisor, $multiplier, $limit_low, $warn_limit_low, $warn_limit, $limit, $current, 'snmp', $entPhysicalIndex, $entPhysicalIndex_measured); } } } diff --git a/includes/discovery/sensors/dbm/datacom.inc.php b/includes/discovery/sensors/dbm/datacom.inc.php index 62527d27c5..cf7924a524 100644 --- a/includes/discovery/sensors/dbm/datacom.inc.php +++ b/includes/discovery/sensors/dbm/datacom.inc.php @@ -16,7 +16,7 @@ foreach ($pre_cache['datacom_oids'] as $index => $entry) { $current = $entry['ddTransceiversRxPower']; $entPhysicalIndex = $index; $entPhysicalIndex_measured = 'ports'; - discover_sensor($valid['sensor'], 'dbm', $device, $oid, 'rx-' . $index, 'datacom', $descr, $divisor, $multiplier, $limit_low, $warn_limit_low, $warn_limit, $limit, $current, 'snmp', $entPhysicalIndex, $entPhysicalIndex_measured); + discover_sensor(null, 'dbm', $device, $oid, 'rx-' . $index, 'datacom', $descr, $divisor, $multiplier, $limit_low, $warn_limit_low, $warn_limit, $limit, $current, 'snmp', $entPhysicalIndex, $entPhysicalIndex_measured); } if (is_numeric(str_replace('dBm', '', $entry['ddTransceiversTxPower']))) { @@ -30,6 +30,6 @@ foreach ($pre_cache['datacom_oids'] as $index => $entry) { $current = $entry['ddTransceiversTxPower']; $entPhysicalIndex = $index; $entPhysicalIndex_measured = 'ports'; - discover_sensor($valid['sensor'], 'dbm', $device, $oid, 'tx-' . $index, 'datacom', $descr, $divisor, $multiplier, $limit_low, $warn_limit_low, $warn_limit, $limit, $current, 'snmp', $entPhysicalIndex, $entPhysicalIndex_measured); + discover_sensor(null, 'dbm', $device, $oid, 'tx-' . $index, 'datacom', $descr, $divisor, $multiplier, $limit_low, $warn_limit_low, $warn_limit, $limit, $current, 'snmp', $entPhysicalIndex, $entPhysicalIndex_measured); } } diff --git a/includes/discovery/sensors/dbm/eltex-mes21xx.inc.php b/includes/discovery/sensors/dbm/eltex-mes21xx.inc.php index 097700d2ec..9a81c1cbcd 100644 --- a/includes/discovery/sensors/dbm/eltex-mes21xx.inc.php +++ b/includes/discovery/sensors/dbm/eltex-mes21xx.inc.php @@ -41,7 +41,7 @@ if ($oids) { $tmp = get_port_by_index_cache($device['device_id'], $ifIndex); $descr = $tmp['ifName']; discover_sensor( - $valid['sensor'], 'dbm', $device, $split, 'txdbm' . $ifIndex, 'rlPhyTestTableTxOutput', 'SfpTxdBm-' . $descr, $divisor, '1', $low_limit, $low_warn_limit, $high_warn_limit, $high_limit, $value + null, 'dbm', $device, $split, 'txdbm' . $ifIndex, 'rlPhyTestTableTxOutput', 'SfpTxdBm-' . $descr, $divisor, '1', $low_limit, $low_warn_limit, $high_warn_limit, $high_limit, $value ); } @@ -51,7 +51,7 @@ if ($oids) { $tmp = get_port_by_index_cache($device['device_id'], $ifIndex); $descr = $tmp['ifName']; discover_sensor( - $valid['sensor'], 'dbm', $device, $split, 'rxdbm' . $ifIndex, 'rlPhyTestTableRxOpticalPower', 'SfpRxdBm-' . $descr, $divisor, '1', $low_limit, $low_warn_limit, $high_warn_limit, $high_limit, $value + null, 'dbm', $device, $split, 'rxdbm' . $ifIndex, 'rlPhyTestTableRxOpticalPower', 'SfpRxdBm-' . $descr, $divisor, '1', $low_limit, $low_warn_limit, $high_warn_limit, $high_limit, $value ); } } diff --git a/includes/discovery/sensors/dbm/eltex-mes23xx.inc.php b/includes/discovery/sensors/dbm/eltex-mes23xx.inc.php index 084db810db..3c2ff2ab35 100644 --- a/includes/discovery/sensors/dbm/eltex-mes23xx.inc.php +++ b/includes/discovery/sensors/dbm/eltex-mes23xx.inc.php @@ -38,7 +38,7 @@ if ($pre_cache['eltex-mes23xx-sfp']) { $descr = $tmp['ifName']; $oid = '.1.3.6.1.4.1.89.90.1.2.1.3.' . $ifIndex . '.8'; discover_sensor( - $valid['sensor'], + null, 'dbm', $device, $oid, @@ -72,7 +72,7 @@ if ($pre_cache['eltex-mes23xx-sfp']) { $descr = $tmp['ifName']; $oid = '.1.3.6.1.4.1.89.90.1.2.1.3.' . $ifIndex . '.9'; discover_sensor( - $valid['sensor'], + null, 'dbm', $device, $oid, diff --git a/includes/discovery/sensors/dbm/eltex-mes24xx.inc.php b/includes/discovery/sensors/dbm/eltex-mes24xx.inc.php index 44dae553bd..7e5ae0f7d7 100644 --- a/includes/discovery/sensors/dbm/eltex-mes24xx.inc.php +++ b/includes/discovery/sensors/dbm/eltex-mes24xx.inc.php @@ -47,7 +47,7 @@ if (! empty($eltexPhyTransceiverDiagnosticTable['txOpticalPower'])) { $descr = get_port_by_index_cache($device['device_id'], $ifIndex)['ifName']; $oid = Oid::toNumeric('ELTEX-PHY-MIB::eltexPhyTransceiverDiagnosticCurrentValue.' . $ifIndex . '.4.1'); discover_sensor( - $valid['sensor'], + null, 'dbm', $device, $oid, @@ -82,7 +82,7 @@ if (! empty($eltexPhyTransceiverDiagnosticTable['rxOpticalPower'])) { $descr = get_port_by_index_cache($device['device_id'], $ifIndex)['ifName']; $oid = Oid::toNumeric('ELTEX-PHY-MIB::eltexPhyTransceiverDiagnosticCurrentValue.' . $ifIndex . '.5.1'); discover_sensor( - $valid['sensor'], + null, 'dbm', $device, $oid, diff --git a/includes/discovery/sensors/dbm/fabos.inc.php b/includes/discovery/sensors/dbm/fabos.inc.php index e75ebb258f..67ec8af63c 100644 --- a/includes/discovery/sensors/dbm/fabos.inc.php +++ b/includes/discovery/sensors/dbm/fabos.inc.php @@ -13,7 +13,7 @@ foreach ($fabosSfpRxPower as $oid => $entry) { $ifIndex = $index + 1073741823; if ($ifAdminStatus[$ifIndex] == '1') { discover_sensor( - $valid['sensor'], + null, 'dbm', $device, ".$oid.$index", @@ -44,7 +44,7 @@ foreach ($fabosSfpTxPower as $oid => $entry) { $ifIndex = $index + 1073741823; if ($ifAdminStatus[$ifIndex] == '1') { discover_sensor( - $valid['sensor'], + null, 'dbm', $device, ".$oid.$index", diff --git a/includes/discovery/sensors/dbm/fs-nmu.inc.php b/includes/discovery/sensors/dbm/fs-nmu.inc.php index a4704db150..d91cc1f3aa 100644 --- a/includes/discovery/sensors/dbm/fs-nmu.inc.php +++ b/includes/discovery/sensors/dbm/fs-nmu.inc.php @@ -72,7 +72,7 @@ if (is_numeric($a1_tx)) { $divisor = '100'; $multiplier = '1'; discover_sensor( - $valid['sensor'], + null, 'dbm', $device, $oid_a1_tx, @@ -97,7 +97,7 @@ if (is_numeric($a1_rx)) { $divisor = '100'; $multiplier = '1'; discover_sensor( - $valid['sensor'], + null, 'dbm', $device, $oid_a1_rx, @@ -122,7 +122,7 @@ if (is_numeric($a2_tx)) { $divisor = '100'; $multiplier = '1'; discover_sensor( - $valid['sensor'], + null, 'dbm', $device, $oid_a2_tx, @@ -147,7 +147,7 @@ if (is_numeric($a2_rx)) { $divisor = '100'; $multiplier = '1'; discover_sensor( - $valid['sensor'], + null, 'dbm', $device, $oid_a2_rx, @@ -170,7 +170,7 @@ if (is_numeric($b1_tx)) { $descr = 'B1 Tx Power'; $index = 'vSFPB1TxPower.0'; discover_sensor( - $valid['sensor'], + null, 'dbm', $device, $oid_b1_tx, @@ -195,7 +195,7 @@ if (is_numeric($b1_rx)) { $divisor = '100'; $multiplier = '1'; discover_sensor( - $valid['sensor'], + null, 'dbm', $device, $oid_b1_rx, @@ -220,7 +220,7 @@ if (is_numeric($b2_tx)) { $divisor = '100'; $multiplier = '1'; discover_sensor( - $valid['sensor'], + null, 'dbm', $device, $oid_b2_tx, @@ -245,7 +245,7 @@ if (is_numeric($b2_rx)) { $divisor = '100'; $multiplier = '1'; discover_sensor( - $valid['sensor'], + null, 'dbm', $device, $oid_b2_rx, @@ -270,7 +270,7 @@ if (is_numeric($c1_tx)) { $divisor = '100'; $multiplier = '1'; discover_sensor( - $valid['sensor'], + null, 'dbm', $device, $oid_c1_tx, @@ -295,7 +295,7 @@ if (is_numeric($c1_rx)) { $divisor = '100'; $multiplier = '1'; discover_sensor( - $valid['sensor'], + null, 'dbm', $device, $oid_c1_rx, @@ -320,7 +320,7 @@ if (is_numeric($c2_tx)) { $divisor = '100'; $multiplier = '1'; discover_sensor( - $valid['sensor'], + null, 'dbm', $device, $oid_c2_tx, @@ -345,7 +345,7 @@ if (is_numeric($c2_rx)) { $divisor = '100'; $multiplier = '1'; discover_sensor( - $valid['sensor'], + null, 'dbm', $device, $oid_c2_rx, @@ -368,7 +368,7 @@ if (is_numeric($d1_tx)) { $descr = 'D1 Tx Power'; $index = 'vSFPD1TxPower.0'; discover_sensor( - $valid['sensor'], + null, 'dbm', $device, $oid_d1_tx, @@ -393,7 +393,7 @@ if (is_numeric($d1_rx)) { $divisor = '100'; $multiplier = '1'; discover_sensor( - $valid['sensor'], + null, 'dbm', $device, $oid_d1_rx, @@ -418,7 +418,7 @@ if (is_numeric($d2_tx)) { $divisor = '100'; $multiplier = '1'; discover_sensor( - $valid['sensor'], + null, 'dbm', $device, $oid_d2_tx, @@ -443,7 +443,7 @@ if (is_numeric($d2_rx)) { $divisor = '100'; $multiplier = '1'; discover_sensor( - $valid['sensor'], + null, 'dbm', $device, $oid_d2_rx, diff --git a/includes/discovery/sensors/dbm/infinera-groove.inc.php b/includes/discovery/sensors/dbm/infinera-groove.inc.php index bf57b72517..280cb0da6c 100644 --- a/includes/discovery/sensors/dbm/infinera-groove.inc.php +++ b/includes/discovery/sensors/dbm/infinera-groove.inc.php @@ -27,6 +27,6 @@ foreach ($pre_cache['infineragroove_portTable'] as $index => $data) { $descr = $data['portAlias'] . ' Receive Power'; $oid = '.1.3.6.1.4.1.42229.1.2.3.6.1.1.4.' . $index; $value = $data['portRxOpticalPower']; - discover_sensor($valid['sensor'], 'dbm', $device, $oid, 'portRxOpticalPower.' . $index, 'infinera-groove', $descr, null, '1', null, null, null, null, $value); + discover_sensor(null, 'dbm', $device, $oid, 'portRxOpticalPower.' . $index, 'infinera-groove', $descr, null, '1', null, null, null, null, $value); } } diff --git a/includes/discovery/sensors/dbm/nokia-isam.inc.php b/includes/discovery/sensors/dbm/nokia-isam.inc.php index 43426ba08e..8d767d0378 100644 --- a/includes/discovery/sensors/dbm/nokia-isam.inc.php +++ b/includes/discovery/sensors/dbm/nokia-isam.inc.php @@ -14,7 +14,7 @@ foreach ($pre_cache['nokiaIsamSfpPort'] as $slotId => $slot) { $limit = ($port['sfpDiagRSSIRxPowerAlmHigh'] / $divisor) ?: -3; $warn_limit = ($port['sfpDiagRSSIRxPowerWarnHigh'] / $divisor) ?: -5; $value = $port['sfpDiagRxPower'] / $divisor; - discover_sensor($valid['sensor'], 'dbm', $device, $oid, $portName . '-rx', 'nokia-isam', $descr, $divisor, $multiplier, $limit_low, $warn_limit_low, $warn_limit, $limit, $value, 'snmp', $entPhysicalIndex, $entPhysicalIndex_measured); + discover_sensor(null, 'dbm', $device, $oid, $portName . '-rx', 'nokia-isam', $descr, $divisor, $multiplier, $limit_low, $warn_limit_low, $warn_limit, $limit, $value, 'snmp', $entPhysicalIndex, $entPhysicalIndex_measured); } if (is_numeric($port['sfpDiagTxPower'])) { $oid = '.1.3.6.1.4.1.637.61.1.56.5.1.6.' . $slotId . '.' . $portId; @@ -24,7 +24,7 @@ foreach ($pre_cache['nokiaIsamSfpPort'] as $slotId => $slot) { $limit = ($port['sfpDiagRSSITxPowerAlmHigh'] / $divisor) ?: -3; $warn_limit = ($port['sfpDiagRSSITxPowerWarnHigh'] / $divisor) ?: -4; $value = $port['sfpDiagTxPower'] / $divisor; - discover_sensor($valid['sensor'], 'dbm', $device, $oid, $portName . '-tx', 'nokia-isam', $descr, $divisor, $multiplier, $limit_low, $warn_limit_low, $warn_limit, $limit, $value, 'snmp', $entPhysicalIndex, $entPhysicalIndex_measured); + discover_sensor(null, 'dbm', $device, $oid, $portName . '-tx', 'nokia-isam', $descr, $divisor, $multiplier, $limit_low, $warn_limit_low, $warn_limit, $limit, $value, 'snmp', $entPhysicalIndex, $entPhysicalIndex_measured); } } } diff --git a/includes/discovery/sensors/dbm/pbn.inc.php b/includes/discovery/sensors/dbm/pbn.inc.php index e99626d9a3..468b874a19 100644 --- a/includes/discovery/sensors/dbm/pbn.inc.php +++ b/includes/discovery/sensors/dbm/pbn.inc.php @@ -26,7 +26,7 @@ foreach ($pre_cache['pbn_oids'] as $index => $entry) { $value = $entry['rxPower'] / $divisor; $entPhysicalIndex = $index; $entPhysicalIndex_measured = 'ports'; - discover_sensor($valid['sensor'], 'dbm', $device, $oid, 'rx-' . $index, 'pbn', $descr, $divisor, $multiplier, $limit_low, $warn_limit_low, $warn_limit, $limit, $value, 'snmp', $entPhysicalIndex, $entPhysicalIndex_measured); + discover_sensor(null, 'dbm', $device, $oid, 'rx-' . $index, 'pbn', $descr, $divisor, $multiplier, $limit_low, $warn_limit_low, $warn_limit, $limit, $value, 'snmp', $entPhysicalIndex, $entPhysicalIndex_measured); } if (is_numeric($entry['txPower']) && ($entry['txPower'] !== '-65535')) { @@ -40,6 +40,6 @@ foreach ($pre_cache['pbn_oids'] as $index => $entry) { $value = $entry['txPower'] / $divisor; $entPhysicalIndex = $index; $entPhysicalIndex_measured = 'ports'; - discover_sensor($valid['sensor'], 'dbm', $device, $oid, 'tx-' . $index, 'pbn', $descr, $divisor, $multiplier, $limit_low, $warn_limit_low, $warn_limit, $limit, $value, 'snmp', $entPhysicalIndex, $entPhysicalIndex_measured); + discover_sensor(null, 'dbm', $device, $oid, 'tx-' . $index, 'pbn', $descr, $divisor, $multiplier, $limit_low, $warn_limit_low, $warn_limit, $limit, $value, 'snmp', $entPhysicalIndex, $entPhysicalIndex_measured); } } diff --git a/includes/discovery/sensors/dbm/procurve.inc.php b/includes/discovery/sensors/dbm/procurve.inc.php index 1c68bc0174..6f49dfcc30 100644 --- a/includes/discovery/sensors/dbm/procurve.inc.php +++ b/includes/discovery/sensors/dbm/procurve.inc.php @@ -17,7 +17,7 @@ foreach ($pre_cache['procurve_hpicfXcvrInfoTable'] as $index => $entry) { $entPhysicalIndex_measured = 'ports'; foreach ($dbquery as $dbindex => $dbresult) { $descr = makeshortif($dbresult['ifDescr']) . ' Port Receive Power'; - discover_sensor($valid['sensor'], 'dbm', $device, $oid, 'hpicfXcvrRxPower.' . $index, 'procurve', $descr, $divisor, $multiplier, $limit_low, $warn_limit_low, $warn_limit, $limit, $current, 'snmp', $entPhysicalIndex, $entPhysicalIndex_measured); + discover_sensor(null, 'dbm', $device, $oid, 'hpicfXcvrRxPower.' . $index, 'procurve', $descr, $divisor, $multiplier, $limit_low, $warn_limit_low, $warn_limit, $limit, $current, 'snmp', $entPhysicalIndex, $entPhysicalIndex_measured); } } @@ -33,7 +33,7 @@ foreach ($pre_cache['procurve_hpicfXcvrInfoTable'] as $index => $entry) { $entPhysicalIndex_measured = 'ports'; foreach ($dbquery as $dbindex => $dbresult) { $descr = makeshortif($dbresult['ifDescr']) . ' Port Transmit Power'; - discover_sensor($valid['sensor'], 'dbm', $device, $oid, 'hpicfXcvrTxPower.-' . $index, 'procurve', $descr, $divisor, $multiplier, $limit_low, $warn_limit_low, $warn_limit, $limit, $current, 'snmp', $entPhysicalIndex, $entPhysicalIndex_measured); + discover_sensor(null, 'dbm', $device, $oid, 'hpicfXcvrTxPower.-' . $index, 'procurve', $descr, $divisor, $multiplier, $limit_low, $warn_limit_low, $warn_limit, $limit, $current, 'snmp', $entPhysicalIndex, $entPhysicalIndex_measured); } } } diff --git a/includes/discovery/sensors/dbm/raisecom-ros.inc.php b/includes/discovery/sensors/dbm/raisecom-ros.inc.php index 53fd3492e2..8107608823 100644 --- a/includes/discovery/sensors/dbm/raisecom-ros.inc.php +++ b/includes/discovery/sensors/dbm/raisecom-ros.inc.php @@ -19,7 +19,7 @@ foreach ($pre_cache['rosMgmtOpticalTransceiverDDMTable'] as $index => $data) { $entPhysicalIndex = $index; $entPhysicalIndex_measured = 'ports'; if ($port['ifAdminStatus'] == 'up') { - discover_sensor($valid['sensor'], 'dbm', $device, $oid, 'tx-' . $index, $sensor_type, $descr, $divisor, $multiplier, $low_limit, $low_warn_limit, $warn_limit, $high_limit, $current, 'snmp', $entPhysicalIndex, $entPhysicalIndex_measured); + discover_sensor(null, 'dbm', $device, $oid, 'tx-' . $index, $sensor_type, $descr, $divisor, $multiplier, $low_limit, $low_warn_limit, $warn_limit, $high_limit, $current, 'snmp', $entPhysicalIndex, $entPhysicalIndex_measured); } } if (($key == 'rxPower') && is_numeric($value['rosMgmtOpticalTransceiverParameterValue']) && ($value['rosMgmtOpticalTransceiverDDMValidStatus'] != 0)) { @@ -35,7 +35,7 @@ foreach ($pre_cache['rosMgmtOpticalTransceiverDDMTable'] as $index => $data) { $entPhysicalIndex = $index; $entPhysicalIndex_measured = 'ports'; if ($port['ifAdminStatus'] == 'up') { - discover_sensor($valid['sensor'], 'dbm', $device, $oid, 'rx-' . $index, $sensor_type, $descr, $divisor, $multiplier, $low_limit, $low_warn_limit, $warn_limit, $high_limit, $current, 'snmp', $entPhysicalIndex, $entPhysicalIndex_measured); + discover_sensor(null, 'dbm', $device, $oid, 'rx-' . $index, $sensor_type, $descr, $divisor, $multiplier, $low_limit, $low_warn_limit, $warn_limit, $high_limit, $current, 'snmp', $entPhysicalIndex, $entPhysicalIndex_measured); } } } diff --git a/includes/discovery/sensors/dbm/raisecom.inc.php b/includes/discovery/sensors/dbm/raisecom.inc.php index 4eb62e597f..08b7430781 100644 --- a/includes/discovery/sensors/dbm/raisecom.inc.php +++ b/includes/discovery/sensors/dbm/raisecom.inc.php @@ -19,7 +19,7 @@ foreach ($pre_cache['raisecomOpticalTransceiverDDMTable'] as $index => $data) { $entPhysicalIndex = $index; $entPhysicalIndex_measured = 'ports'; if ($port['ifAdminStatus'] == 'up') { - discover_sensor($valid['sensor'], 'dbm', $device, $oid, 'tx-' . $index, $sensor_type, $descr, $divisor, $multiplier, $low_limit, $low_warn_limit, $warn_limit, $high_limit, $current, 'snmp', $entPhysicalIndex, $entPhysicalIndex_measured); + discover_sensor(null, 'dbm', $device, $oid, 'tx-' . $index, $sensor_type, $descr, $divisor, $multiplier, $low_limit, $low_warn_limit, $warn_limit, $high_limit, $current, 'snmp', $entPhysicalIndex, $entPhysicalIndex_measured); } } if (($key == 'rxPower') && is_numeric($value['raisecomOpticalTransceiverParameterValue']) && ($value['raisecomOpticalTransceiverDDMValidStatus'] != 0)) { @@ -35,7 +35,7 @@ foreach ($pre_cache['raisecomOpticalTransceiverDDMTable'] as $index => $data) { $entPhysicalIndex = $index; $entPhysicalIndex_measured = 'ports'; if ($port['ifAdminStatus'] == 'up') { - discover_sensor($valid['sensor'], 'dbm', $device, $oid, 'rx-' . $index, $sensor_type, $descr, $divisor, $multiplier, $low_limit, $low_warn_limit, $warn_limit, $high_limit, $current, 'snmp', $entPhysicalIndex, $entPhysicalIndex_measured); + discover_sensor(null, 'dbm', $device, $oid, 'rx-' . $index, $sensor_type, $descr, $divisor, $multiplier, $low_limit, $low_warn_limit, $warn_limit, $high_limit, $current, 'snmp', $entPhysicalIndex, $entPhysicalIndex_measured); } } } diff --git a/includes/discovery/sensors/dbm/timos.inc.php b/includes/discovery/sensors/dbm/timos.inc.php index 173efdf296..2037ab6fdf 100755 --- a/includes/discovery/sensors/dbm/timos.inc.php +++ b/includes/discovery/sensors/dbm/timos.inc.php @@ -28,7 +28,7 @@ foreach ($pre_cache['timos_oids'] as $index => $entry) { $port_descr = get_port_by_index_cache($device['device_id'], str_replace('1.', '', $index)); $descr = $port_descr['ifName'] . ' RX Power ' . $int_ext; - discover_sensor($valid['sensor'], 'dbm', $device, $oid, 'rx-' . $index, 'timos', $descr, $divisor, $multiplier, $limit_low, $warn_limit_low, $warn_limit, $limit, $value, 'snmp', $entPhysicalIndex, $entPhysicalIndex_measured, $user_func); + discover_sensor(null, 'dbm', $device, $oid, 'rx-' . $index, 'timos', $descr, $divisor, $multiplier, $limit_low, $warn_limit_low, $warn_limit, $limit, $value, 'snmp', $entPhysicalIndex, $entPhysicalIndex_measured, $user_func); } if (is_numeric($entry['tmnxDDMTxOutputPower']) && $entry['tmnxDDMTxOutputPower'] != 0 && $entry['tmnxDDMRxOpticalPower'] != 0) { $oid = '.1.3.6.1.4.1.6527.3.1.2.2.4.31.1.16.' . $index; @@ -44,6 +44,6 @@ foreach ($pre_cache['timos_oids'] as $index => $entry) { $port_descr = get_port_by_index_cache($device['device_id'], str_replace('1.', '', $index)); $descr = $port_descr['ifName'] . ' TX Power'; - discover_sensor($valid['sensor'], 'dbm', $device, $oid, 'tx-' . $index, 'timos', $descr, $divisor, $multiplier, $limit_low, $warn_limit_low, $warn_limit, $limit, $value, 'snmp', $entPhysicalIndex, $entPhysicalIndex_measured, $user_func); + discover_sensor(null, 'dbm', $device, $oid, 'tx-' . $index, 'timos', $descr, $divisor, $multiplier, $limit_low, $warn_limit_low, $warn_limit, $limit, $value, 'snmp', $entPhysicalIndex, $entPhysicalIndex_measured, $user_func); } } diff --git a/includes/discovery/sensors/dbm/wipipe.inc.php b/includes/discovery/sensors/dbm/wipipe.inc.php index ad38e59047..98caa84eb7 100644 --- a/includes/discovery/sensors/dbm/wipipe.inc.php +++ b/includes/discovery/sensors/dbm/wipipe.inc.php @@ -28,7 +28,7 @@ foreach ($pre_cache['wipipe_oids'] as $index => $entry) { $currentsignal = $entry['mdmSignalStrength']; // Discover Sensor discover_sensor( - $valid['sensor'], + null, 'dbm', $device, $oid, diff --git a/includes/discovery/sensors/delay/infinera-groove.inc.php b/includes/discovery/sensors/delay/infinera-groove.inc.php index 8da76e05f9..7dbeb71b53 100644 --- a/includes/discovery/sensors/delay/infinera-groove.inc.php +++ b/includes/discovery/sensors/delay/infinera-groove.inc.php @@ -30,6 +30,6 @@ foreach ($pre_cache['infineragroove_portTable'] as $index => $data) { $oid = '.1.3.6.1.4.1.42229.1.2.4.1.19.1.1.22.' . $index; $value = $data['ochOsDGD']; $divisor = 1000000000000; - discover_sensor($valid['sensor'], 'delay', $device, $oid, 'ochOsOSNR.' . $index, 'infinera-groove', $descr, $divisor, '1', null, null, null, null, $value); + discover_sensor(null, 'delay', $device, $oid, 'ochOsOSNR.' . $index, 'infinera-groove', $descr, $divisor, '1', null, null, null, null, $value); } } diff --git a/includes/discovery/sensors/entity-sensor.inc.php b/includes/discovery/sensors/entity-sensor.inc.php index 3667f1d6cd..fe0f7b2dfd 100644 --- a/includes/discovery/sensors/entity-sensor.inc.php +++ b/includes/discovery/sensors/entity-sensor.inc.php @@ -256,7 +256,7 @@ if (! empty($entity_oids)) { // End grouping sensors } $descr = trim($descr); - discover_sensor($valid['sensor'], $type, $device, $oid, $index, 'entity-sensor', $descr, $divisor, $multiplier, $low_limit, $low_warn_limit, $warn_limit, $high_limit, $current, 'snmp', $entPhysicalIndex, $entry['entSensorMeasuredEntity'] ?? null, null, $group); + discover_sensor(null, $type, $device, $oid, $index, 'entity-sensor', $descr, $divisor, $multiplier, $low_limit, $low_warn_limit, $warn_limit, $high_limit, $current, 'snmp', $entPhysicalIndex, $entry['entSensorMeasuredEntity'] ?? null, null, $group); } }//end if }//end foreach diff --git a/includes/discovery/sensors/fanspeed/apc.inc.php b/includes/discovery/sensors/fanspeed/apc.inc.php index e4af6fa897..d0ae5c0e63 100644 --- a/includes/discovery/sensors/fanspeed/apc.inc.php +++ b/includes/discovery/sensors/fanspeed/apc.inc.php @@ -28,6 +28,6 @@ foreach ($pre_cache['cooling_unit_analog'] as $index => $data) { $scale = $data['coolingUnitStatusAnalogScale'] ?? null; $value = $data['coolingUnitStatusAnalogValue'] ?? null; if (preg_match('/Fan Speed/', $descr) && $data['coolingUnitStatusAnalogUnits'] == '%' && $value >= 0) { - discover_sensor($valid['sensor'], 'fanspeed', $device, $cur_oid, $cur_oid, 'apc', $descr, $scale, 1, null, null, null, null, $value); + discover_sensor(null, 'fanspeed', $device, $cur_oid, $cur_oid, 'apc', $descr, $scale, 1, null, null, null, null, $value); } } diff --git a/includes/discovery/sensors/fanspeed/areca.inc.php b/includes/discovery/sensors/fanspeed/areca.inc.php index fd414f8bc7..4a00fce03e 100644 --- a/includes/discovery/sensors/fanspeed/areca.inc.php +++ b/includes/discovery/sensors/fanspeed/areca.inc.php @@ -16,6 +16,6 @@ foreach (explode("\n", $oids) as $data) { $oid = '.1.3.6.1.4.1.18928.1.2.2.1.9.1.3.' . $index; $current = snmp_get($device, $oid, '-Oqv', ''); - discover_sensor($valid['sensor'], 'fanspeed', $device, $oid, $index, 'areca', trim($descr, '"'), '1', '1', null, null, null, null, $current); + discover_sensor(null, 'fanspeed', $device, $oid, $index, 'areca', trim($descr, '"'), '1', '1', null, null, null, null, $current); } } diff --git a/includes/discovery/sensors/fanspeed/benuos.inc.php b/includes/discovery/sensors/fanspeed/benuos.inc.php index 562f826870..63ff1a39bd 100644 --- a/includes/discovery/sensors/fanspeed/benuos.inc.php +++ b/includes/discovery/sensors/fanspeed/benuos.inc.php @@ -14,6 +14,6 @@ for ($index = 4; $index <= 9; $index++) { //Benu Fans are index 4 thru 9 $sensor_oid = ".1.3.6.1.4.1.39406.1.1.1.4.1.1.5.1.$index"; $descr = $data["1.$index"]['benuSensorName'] ?? null; $current = $data["1.$index"]['benuSensorValue'] ?? null; - discover_sensor($valid['sensor'], 'fanspeed', $device, $sensor_oid, $sensor_index, 'benuos', $descr, '1', '1', null, null, null, null, $current); + discover_sensor(null, 'fanspeed', $device, $sensor_oid, $sensor_index, 'benuos', $descr, '1', '1', null, null, null, null, $current); $sensor_index++; }//end loop diff --git a/includes/discovery/sensors/fanspeed/dell.inc.php b/includes/discovery/sensors/fanspeed/dell.inc.php index dce1b67067..32b53ad4ae 100644 --- a/includes/discovery/sensors/fanspeed/dell.inc.php +++ b/includes/discovery/sensors/fanspeed/dell.inc.php @@ -22,6 +22,6 @@ if (is_array($temp)) { $warnlimit = $temp[$index]['coolingDeviceUpperNonCriticalThreshold']; $limit = $temp[$index]['coolingDeviceUpperCriticalThreshold']; - discover_sensor($valid['sensor'], 'fanspeed', $device, $cur_oid . $index, $index, 'dell', $descr, '0', '1', $lowlimit, $low_warn_limit, $warnlimit, $limit, $value, 'snmp', $index); + discover_sensor(null, 'fanspeed', $device, $cur_oid . $index, $index, 'dell', $descr, '0', '1', $lowlimit, $low_warn_limit, $warnlimit, $limit, $value, 'snmp', $index); } } diff --git a/includes/discovery/sensors/fanspeed/drac.inc.php b/includes/discovery/sensors/fanspeed/drac.inc.php index 3f30b396c6..f6cc8707f5 100644 --- a/includes/discovery/sensors/fanspeed/drac.inc.php +++ b/includes/discovery/sensors/fanspeed/drac.inc.php @@ -22,6 +22,6 @@ foreach (explode("\n", $oids) as $data) { $current = snmp_get($device, $fan_oid, '-Oqv', 'IDRAC-MIB-SMIv2'); $low_limit = snmp_get($device, $limit_oid, '-Oqv', 'IDRAC-MIB-SMIv2'); $divisor = '1'; - discover_sensor($valid['sensor'], 'fanspeed', $device, $fan_oid, $index, 'drac', $descr, $divisor, '1', $low_limit, null, null, null, $current); + discover_sensor(null, 'fanspeed', $device, $fan_oid, $index, 'drac', $descr, $divisor, '1', $low_limit, null, null, null, $current); } } diff --git a/includes/discovery/sensors/fanspeed/eltex-olt.inc.php b/includes/discovery/sensors/fanspeed/eltex-olt.inc.php index 202942d73d..b3291cb744 100644 --- a/includes/discovery/sensors/fanspeed/eltex-olt.inc.php +++ b/includes/discovery/sensors/fanspeed/eltex-olt.inc.php @@ -35,7 +35,7 @@ if ($tmp_eltex['.1.3.6.1.4.1.35265.1.22.1.10.6.0']) { $descr = 'Fan 0'; $divisor = 1; $fanspeed = $tmp_eltex[$oid]; - discover_sensor($valid['sensor'], 'fanspeed', $device, $oid, $index, $type, $descr, $divisor, '1', $min_eltex, null, null, $max_eltex, $fanspeed); + discover_sensor(null, 'fanspeed', $device, $oid, $index, $type, $descr, $divisor, '1', $min_eltex, null, null, $max_eltex, $fanspeed); } } @@ -47,7 +47,7 @@ if ($tmp_eltex['.1.3.6.1.4.1.35265.1.22.1.10.8.0']) { $descr = 'Fan 1'; $divisor = 1; $fanspeed = $tmp_eltex[$oid]; - discover_sensor($valid['sensor'], 'fanspeed', $device, $oid, $index, $type, $descr, $divisor, '1', $min_eltex, null, null, $max_eltex, $fanspeed); + discover_sensor(null, 'fanspeed', $device, $oid, $index, $type, $descr, $divisor, '1', $min_eltex, null, null, $max_eltex, $fanspeed); } } diff --git a/includes/discovery/sensors/fanspeed/equallogic.inc.php b/includes/discovery/sensors/fanspeed/equallogic.inc.php index 75cf81c263..062d2246c2 100644 --- a/includes/discovery/sensors/fanspeed/equallogic.inc.php +++ b/includes/discovery/sensors/fanspeed/equallogic.inc.php @@ -33,7 +33,7 @@ if (! empty($oids)) { $index = (100 + $index); if ($extra[$keys[0]]['eqlMemberHealthDetailsFanCurrentState'] != 'unknown') { - discover_sensor($valid['sensor'], 'fanspeed', $device, $oid, $index, 'snmp', $descr, 1, 1, $low_limit, $low_warn, $high_limit, $high_warn, $temperature); + discover_sensor(null, 'fanspeed', $device, $oid, $index, 'snmp', $descr, 1, 1, $low_limit, $low_warn, $high_limit, $high_warn, $temperature); } }//end if }//end foreach diff --git a/includes/discovery/sensors/fanspeed/f5.inc.php b/includes/discovery/sensors/fanspeed/f5.inc.php index edfcc7b5c9..4a6cf63423 100644 --- a/includes/discovery/sensors/fanspeed/f5.inc.php +++ b/includes/discovery/sensors/fanspeed/f5.inc.php @@ -20,7 +20,7 @@ if ($oids) { $oid = '.1.3.6.1.4.1.3375.2.1.3.2.1.2.1.3.' . $index; $fanspeed = $fanspeed / $divisor; if ($fanspeed >= 0) { - discover_sensor($valid['sensor'], 'fanspeed', $device, $oid, $index, $type, $descr, $divisor, '1', null, null, null, null, $fanspeed); + discover_sensor(null, 'fanspeed', $device, $oid, $index, $type, $descr, $divisor, '1', null, null, null, null, $fanspeed); } } } diff --git a/includes/discovery/sensors/fanspeed/ibm-amm.inc.php b/includes/discovery/sensors/fanspeed/ibm-amm.inc.php index 01030891b6..00afdbe1e9 100644 --- a/includes/discovery/sensors/fanspeed/ibm-amm.inc.php +++ b/includes/discovery/sensors/fanspeed/ibm-amm.inc.php @@ -24,6 +24,6 @@ foreach ($oids as $index => $oid) { if (is_numeric($value)) { $descr = $descr_prefix . ($index + 1); - discover_sensor($valid['sensor'], 'fanspeed', $device, $oid, $index, 'snmp', $descr, 1, 1, null, null, null, null, $value); + discover_sensor(null, 'fanspeed', $device, $oid, $index, 'snmp', $descr, 1, 1, null, null, null, null, $value); } } diff --git a/includes/discovery/sensors/fanspeed/netonix.inc.php b/includes/discovery/sensors/fanspeed/netonix.inc.php index 20c80a4b16..6820836ca1 100644 --- a/includes/discovery/sensors/fanspeed/netonix.inc.php +++ b/includes/discovery/sensors/fanspeed/netonix.inc.php @@ -31,7 +31,7 @@ if (is_array($oids)) { $descr = 'Fan ' . $index; $oid = '.1.3.6.1.4.1.46242.2.1.2.' . $index; $current = $entry['fanSpeed']; - discover_sensor($valid['sensor'], 'fanspeed', $device, $oid, $index, $device['os'], $descr, '1', '1', 0, 0, 8000, 9000, $current); + discover_sensor(null, 'fanspeed', $device, $oid, $index, $device['os'], $descr, '1', '1', 0, 0, 8000, 9000, $current); } } } diff --git a/includes/discovery/sensors/fanspeed/nos.inc.php b/includes/discovery/sensors/fanspeed/nos.inc.php index b52183862c..9a2ae87ea6 100644 --- a/includes/discovery/sensors/fanspeed/nos.inc.php +++ b/includes/discovery/sensors/fanspeed/nos.inc.php @@ -26,7 +26,7 @@ foreach (explode("\n", $oids) as $data) { if (! strstr($descr, 'No') and ! strstr($value, 'No')) { $descr = str_replace('"', '', $descr); $descr = trim($descr); - discover_sensor($valid['sensor'], 'fanspeed', $device, $value_oid, $oididx, 'nos', $descr, '1', '1', null, null, '80', '100', $value); + discover_sensor(null, 'fanspeed', $device, $value_oid, $oididx, 'nos', $descr, '1', '1', null, null, '80', '100', $value); } } } diff --git a/includes/discovery/sensors/fanspeed/onefs.inc.php b/includes/discovery/sensors/fanspeed/onefs.inc.php index 448f2afcca..cfd7db748b 100644 --- a/includes/discovery/sensors/fanspeed/onefs.inc.php +++ b/includes/discovery/sensors/fanspeed/onefs.inc.php @@ -30,7 +30,7 @@ foreach ($oids as $index => $entry) { $descr = $entry['fanDescription']; $oid = '.1.3.6.1.4.1.12124.2.53.1.4.' . $index; $current = $entry['fanSpeed']; - discover_sensor($valid['sensor'], 'fanspeed', $device, $oid, $index, 'onefs', $descr, '1', '1', 0, 0, 5000, 9000, $current); + discover_sensor(null, 'fanspeed', $device, $oid, $index, 'onefs', $descr, '1', '1', 0, 0, 5000, 9000, $current); } } diff --git a/includes/discovery/sensors/fanspeed/quanta.inc.php b/includes/discovery/sensors/fanspeed/quanta.inc.php index 6196d8eb8c..cf97632dae 100644 --- a/includes/discovery/sensors/fanspeed/quanta.inc.php +++ b/includes/discovery/sensors/fanspeed/quanta.inc.php @@ -22,6 +22,6 @@ foreach ($sensors_values as $index => $entry) { $descr = "Fan Speed $index:"; if ($current_value > 0) { - discover_sensor($valid['sensor'], 'fanspeed', $device, "$numeric_oid_base.$index", $index, $sensor_type, $descr, 1, 1, null, null, null, null, $current_value); + discover_sensor(null, 'fanspeed', $device, "$numeric_oid_base.$index", $index, $sensor_type, $descr, 1, 1, null, null, null, null, $current_value); } } diff --git a/includes/discovery/sensors/fanspeed/sgos.inc.php b/includes/discovery/sensors/fanspeed/sgos.inc.php index 24ca62c0a2..0b993db1ca 100644 --- a/includes/discovery/sensors/fanspeed/sgos.inc.php +++ b/includes/discovery/sensors/fanspeed/sgos.inc.php @@ -12,7 +12,7 @@ for ($index = 21; $index < 39; $index++) { //Proxy SG Fan OID end in 21-38 $descr = snmp_get($device, $descr_oid, '-Oqv', 'BLUECOAT-SG-SENSOR-MIB'); $current = snmp_get($device, $fan_oid, '-Oqv', 'BLUECOAT-SG-SENSOR-MIB'); $divisor = '1'; - discover_sensor($valid['sensor'], 'fanspeed', $device, $fan_oid, $fan_index, 'sgos', $descr, 1, '1', null, null, null, null, $current); + discover_sensor(null, 'fanspeed', $device, $fan_oid, $fan_index, 'sgos', $descr, 1, '1', null, null, null, null, $current); } $fan_index++; }//end for diff --git a/includes/discovery/sensors/fanspeed/supermicro.inc.php b/includes/discovery/sensors/fanspeed/supermicro.inc.php index e9d67f7831..bf5e6b4457 100644 --- a/includes/discovery/sensors/fanspeed/supermicro.inc.php +++ b/includes/discovery/sensors/fanspeed/supermicro.inc.php @@ -30,7 +30,7 @@ foreach (explode("\n", $oids) as $data) { $descr = str_replace(' Fan Speed', '', $descr); $descr = str_replace(' Speed', '', $descr); if ($monitor == 'true') { - discover_sensor($valid['sensor'], 'fanspeed', $device, $fan_oid, $index, 'supermicro', $descr, $divisor, '1', $low_limit, null, null, null, $current); + discover_sensor(null, 'fanspeed', $device, $fan_oid, $index, 'supermicro', $descr, $divisor, '1', $low_limit, null, null, null, $current); } } }//end if diff --git a/includes/discovery/sensors/fanspeed/unix.inc.php b/includes/discovery/sensors/fanspeed/unix.inc.php index b5c33c41bf..a19adb52f5 100644 --- a/includes/discovery/sensors/fanspeed/unix.inc.php +++ b/includes/discovery/sensors/fanspeed/unix.inc.php @@ -34,7 +34,7 @@ if (! empty($snmpData)) { $value = intval($lmData[$type . 'Value']) / $divisor; if (! empty($descr)) { $oid = Oid::toNumeric('LM-SENSORS-MIB::' . $type . 'Value.' . $index); - discover_sensor($valid['sensor'], 'fanspeed', $device, $oid, $index, 'lmsensors', $descr, $divisor, 1, null, null, null, null, $value, 'snmp', null, null, null, 'lmsensors'); + discover_sensor(null, 'fanspeed', $device, $oid, $index, 'lmsensors', $descr, $divisor, 1, null, null, null, null, $value, 'snmp', null, null, null, 'lmsensors'); } } } diff --git a/includes/discovery/sensors/fanspeed/xos.inc.php b/includes/discovery/sensors/fanspeed/xos.inc.php index 8e2a51310a..2b63193344 100644 --- a/includes/discovery/sensors/fanspeed/xos.inc.php +++ b/includes/discovery/sensors/fanspeed/xos.inc.php @@ -21,6 +21,6 @@ foreach ($oids as $index => $entry) { $low_warn_limit = round_Nth($value * 0.75, 100); $low_limit = round_Nth($value * 0.5, 100); if (is_numeric($value)) { - discover_sensor($valid['sensor'], 'fanspeed', $device, $oid, $index, 'extreme-fanspeed', $descr, '1', '1', $low_limit, $low_warn_limit, $high_warn_limit, $high_limit, $value); + discover_sensor(null, 'fanspeed', $device, $oid, $index, 'extreme-fanspeed', $descr, '1', '1', $low_limit, $low_warn_limit, $high_warn_limit, $high_limit, $value); } } diff --git a/includes/discovery/sensors/frequency/apc.inc.php b/includes/discovery/sensors/frequency/apc.inc.php index 175e462d50..545ec1fd4b 100644 --- a/includes/discovery/sensors/frequency/apc.inc.php +++ b/includes/discovery/sensors/frequency/apc.inc.php @@ -17,7 +17,7 @@ foreach (explode("\n", $oids) as $data) { $index = $split_oid[count($split_oid) - 1]; $oid = '.1.3.6.1.4.1.318.1.1.8.5.3.2.1.4.' . $index; $descr = 'Input Feed ' . chr(64 + $index); - discover_sensor($valid['sensor'], 'frequency', $device, $oid, "3.2.1.4.$index", $type, $descr, $divisor, '1', null, null, null, null, $current); + discover_sensor(null, 'frequency', $device, $oid, "3.2.1.4.$index", $type, $descr, $divisor, '1', null, null, null, null, $current); } } @@ -42,7 +42,7 @@ foreach (explode("\n", $oids) as $data) { $descr .= " $index"; } - discover_sensor($valid['sensor'], 'frequency', $device, $oid, "4.2.1.4.$index", $type, $descr, $divisor, '1', null, null, null, null, $current); + discover_sensor(null, 'frequency', $device, $oid, "4.2.1.4.$index", $type, $descr, $divisor, '1', null, null, null, null, $current); } } @@ -65,7 +65,7 @@ if ($oids) { [$oid,$current] = explode(' ', $oids); $type = 'apc'; $descr = 'Input'; - discover_sensor($valid['sensor'], 'frequency', $device, $oid, $index, $type, $descr, $divisor, '1', null, null, null, null, $current / $divisor); + discover_sensor(null, 'frequency', $device, $oid, $index, $type, $descr, $divisor, '1', null, null, null, null, $current / $divisor); } // upsHighPrecOutputFrequency @@ -87,5 +87,5 @@ if ($oids) { [$oid,$current] = explode(' ', $oids); $type = 'apc'; $descr = 'Output'; - discover_sensor($valid['sensor'], 'frequency', $device, $oid, $index, $type, $descr, $divisor, '1', null, null, null, null, $current / $divisor); + discover_sensor(null, 'frequency', $device, $oid, $index, $type, $descr, $divisor, '1', null, null, null, null, $current / $divisor); } diff --git a/includes/discovery/sensors/frequency/eaton-ats.inc.php b/includes/discovery/sensors/frequency/eaton-ats.inc.php index 548fdc9517..9b6d605ea5 100644 --- a/includes/discovery/sensors/frequency/eaton-ats.inc.php +++ b/includes/discovery/sensors/frequency/eaton-ats.inc.php @@ -31,5 +31,5 @@ foreach ($oids as $volt_id => $data) { $divisor = 10; $current = $data['ats2InputFrequency'] / $divisor; - discover_sensor($valid['sensor'], 'frequency', $device, $volt_oid, $index, $type, $descr, $divisor, '1', null, null, null, null, $current); + discover_sensor(null, 'frequency', $device, $volt_oid, $index, $type, $descr, $divisor, '1', null, null, null, null, $current); } diff --git a/includes/discovery/sensors/frequency/eatonups.inc.php b/includes/discovery/sensors/frequency/eatonups.inc.php index 75c04643d0..29dd5aaed2 100644 --- a/includes/discovery/sensors/frequency/eatonups.inc.php +++ b/includes/discovery/sensors/frequency/eatonups.inc.php @@ -16,7 +16,7 @@ foreach ($oids as $freq_id => $data) { $type = 'xups'; $index = '3.1.' . $freq_id; - discover_sensor($valid['sensor'], 'frequency', $device, $freq_oid, $index, $type, $descr, $divisor, '1', null, null, null, null, $current); + discover_sensor(null, 'frequency', $device, $freq_oid, $index, $type, $descr, $divisor, '1', null, null, null, null, $current); } // XUPS-MIB::xupsOutputFrequency.0 = INTEGER: 500 @@ -32,7 +32,7 @@ foreach ($oids as $freq_id => $data) { $current = $data['xupsOutputFrequency'] / $divisor; $type = 'xups'; $index = '4.2.' . $freq_id; - discover_sensor($valid['sensor'], 'frequency', $device, $freq_oid, $index, $type, $descr, $divisor, '1', null, null, null, null, $current); + discover_sensor(null, 'frequency', $device, $freq_oid, $index, $type, $descr, $divisor, '1', null, null, null, null, $current); } // XUPS-MIB::xupsBypassFrequency.0 = INTEGER: 500 @@ -52,6 +52,6 @@ foreach ($oids as $freq_id => $data) { $type = 'xups'; $index = '5.1.' . $freq_id; - discover_sensor($valid['sensor'], 'frequency', $device, $freq_oid, $index, $type, $descr, $divisor, '1', null, null, null, null, $current); + discover_sensor(null, 'frequency', $device, $freq_oid, $index, $type, $descr, $divisor, '1', null, null, null, null, $current); } } diff --git a/includes/discovery/sensors/frequency/ipoman.inc.php b/includes/discovery/sensors/frequency/ipoman.inc.php index f5d9a353e3..8d4c8161f0 100644 --- a/includes/discovery/sensors/frequency/ipoman.inc.php +++ b/includes/discovery/sensors/frequency/ipoman.inc.php @@ -19,7 +19,7 @@ if (is_array($oids)) { $current = ($entry['inletStatusFrequency'] / 10); $low_limit = $entry['inletConfigFrequencyLow']; $high_limit = $entry['inletConfigFrequencyHigh']; - discover_sensor($valid['sensor'], 'frequency', $device, $freq_oid, $index, 'ipoman', $descr, $divisor, '1', $low_limit, null, null, $high_limit, $current); + discover_sensor(null, 'frequency', $device, $freq_oid, $index, 'ipoman', $descr, $divisor, '1', $low_limit, null, null, $high_limit, $current); // FIXME: iPoMan 1201 also says it has 2 inlets, at least until firmware 1.06 - wtf? } } diff --git a/includes/discovery/sensors/frequency/linux.inc.php b/includes/discovery/sensors/frequency/linux.inc.php index f0b51471e9..c9211a105f 100644 --- a/includes/discovery/sensors/frequency/linux.inc.php +++ b/includes/discovery/sensors/frequency/linux.inc.php @@ -18,7 +18,7 @@ if (! empty($pre_cache['raspberry_pi_sensors'])) { } $value = current($pre_cache['raspberry_pi_sensors']['raspberry.' . $freq]); if (is_numeric($value)) { - discover_sensor($valid['sensor'], 'frequency', $device, $oid . $freq, $freq, $sensor_type, $descr, 1, 1, null, null, null, null, $value); + discover_sensor(null, 'frequency', $device, $oid . $freq, $freq, $sensor_type, $descr, 1, 1, null, null, null, null, $value); } else { break; } diff --git a/includes/discovery/sensors/frequency/mgeups.inc.php b/includes/discovery/sensors/frequency/mgeups.inc.php index f80ed4d5cd..8fc20ad0ed 100644 --- a/includes/discovery/sensors/frequency/mgeups.inc.php +++ b/includes/discovery/sensors/frequency/mgeups.inc.php @@ -22,7 +22,7 @@ for ($i = 1; $i <= $numPhase; $i++) { $type = 'mge-ups'; $divisor = 10; $index = $i; - discover_sensor($valid['sensor'], 'frequency', $device, $freq_oid, $index, $type, $descr, $divisor, '1', null, null, null, null, $current); + discover_sensor(null, 'frequency', $device, $freq_oid, $index, $type, $descr, $divisor, '1', null, null, null, null, $current); } $oids = trim(snmp_walk($device, '.1.3.6.1.4.1.705.1.6.1', '-OsqnU')); @@ -46,5 +46,5 @@ for ($i = 1; $i <= $numPhase; $i++) { $type = 'mge-ups'; $divisor = 10; $index = (100 + $i); - discover_sensor($valid['sensor'], 'frequency', $device, $freq_oid, $index, $type, $descr, $divisor, '1', null, null, null, null, $current); + discover_sensor(null, 'frequency', $device, $freq_oid, $index, $type, $descr, $divisor, '1', null, null, null, null, $current); } diff --git a/includes/discovery/sensors/frequency/netagent2.inc.php b/includes/discovery/sensors/frequency/netagent2.inc.php index 2aba0e806b..12161c9fce 100644 --- a/includes/discovery/sensors/frequency/netagent2.inc.php +++ b/includes/discovery/sensors/frequency/netagent2.inc.php @@ -51,7 +51,7 @@ if ($in_phaseNum == '1') { $descr = 'Input frequency'; discover_sensor( - $valid['sensor'], + null, 'frequency', $device, $in_frequency_oid, @@ -83,7 +83,7 @@ if ($in_phaseNum == '1') { $descr = 'Output frequency'; discover_sensor( - $valid['sensor'], + null, 'frequency', $device, $out_frequency_oid, @@ -119,7 +119,7 @@ if ($in_phaseNum == '3') { $descr = 'Input frequency'; discover_sensor( - $valid['sensor'], + null, 'frequency', $device, $in_frequency_oid, @@ -151,7 +151,7 @@ if ($in_phaseNum == '3') { $descr = 'Output frequency'; discover_sensor( - $valid['sensor'], + null, 'frequency', $device, $in_frequency_oid, @@ -183,7 +183,7 @@ if ($in_phaseNum == '3') { $descr = 'Bypass frequency'; discover_sensor( - $valid['sensor'], + null, 'frequency', $device, $in_frequency_oid, diff --git a/includes/discovery/sensors/frequency/netvision.inc.php b/includes/discovery/sensors/frequency/netvision.inc.php index 06d6a74678..997b2c2054 100644 --- a/includes/discovery/sensors/frequency/netvision.inc.php +++ b/includes/discovery/sensors/frequency/netvision.inc.php @@ -6,7 +6,7 @@ $current = (snmp_get($device, $freq_oid, '-Oqv') / 10); $type = 'netvision'; $divisor = 10; $index = '3.2.0'; -discover_sensor($valid['sensor'], 'frequency', $device, $freq_oid, $index, $type, $descr, $divisor, '1', null, null, null, null, $current); +discover_sensor(null, 'frequency', $device, $freq_oid, $index, $type, $descr, $divisor, '1', null, null, null, null, $current); $freq_oid = '.1.3.6.1.4.1.4555.1.1.1.1.4.2.0'; $descr = 'Output'; @@ -14,4 +14,4 @@ $current = (snmp_get($device, $freq_oid, '-Oqv') / 10); $type = 'netvision'; $divisor = 10; $index = '4.2.0'; -discover_sensor($valid['sensor'], 'frequency', $device, $freq_oid, $index, $type, $descr, $divisor, '1', null, null, null, null, $current); +discover_sensor(null, 'frequency', $device, $freq_oid, $index, $type, $descr, $divisor, '1', null, null, null, null, $current); diff --git a/includes/discovery/sensors/frequency/powerlogic.inc.php b/includes/discovery/sensors/frequency/powerlogic.inc.php index 0111c52e0e..b302a8e06a 100644 --- a/includes/discovery/sensors/frequency/powerlogic.inc.php +++ b/includes/discovery/sensors/frequency/powerlogic.inc.php @@ -29,7 +29,7 @@ if (is_numeric($data['fFrequency'][1])) { $index = 'fFrequency'; $descr = 'Frequency'; $current = $data['fFrequency'][1]; - discover_sensor($valid['sensor'], 'frequency', $device, $current_oid, $index, 'powerlogic', $descr, 1, 1, null, null, null, null, $current); + discover_sensor(null, 'frequency', $device, $current_oid, $index, 'powerlogic', $descr, 1, 1, null, null, null, null, $current); } unset($data); diff --git a/includes/discovery/sensors/frequency/raritan-pdu.inc.php b/includes/discovery/sensors/frequency/raritan-pdu.inc.php index d6fe6d954a..2f1c4f4120 100644 --- a/includes/discovery/sensors/frequency/raritan-pdu.inc.php +++ b/includes/discovery/sensors/frequency/raritan-pdu.inc.php @@ -19,7 +19,7 @@ foreach (explode("\n", $inlet_oids) as $inlet_data) { $inlet_frequency = snmp_get($device, "measurementsInletSensorValue.$inlet_index.frequency", '-Ovq', 'PDU2-MIB'); if (is_numeric($inlet_frequency)) { $inlet_frequency = ($inlet_frequency / $inlet_divisor); - discover_sensor($valid['sensor'], 'frequency', $device, $inlet_oid, $inlet_index, 'raritan', $inlet_descr, $inlet_divisor, 1, null, null, null, null, $inlet_frequency); + discover_sensor(null, 'frequency', $device, $inlet_oid, $inlet_index, 'raritan', $inlet_descr, $inlet_divisor, 1, null, null, null, null, $inlet_frequency); } } } diff --git a/includes/discovery/sensors/frequency/rfc1628.inc.php b/includes/discovery/sensors/frequency/rfc1628.inc.php index ea766f1c0c..ccbdddd31e 100644 --- a/includes/discovery/sensors/frequency/rfc1628.inc.php +++ b/includes/discovery/sensors/frequency/rfc1628.inc.php @@ -19,7 +19,7 @@ foreach ($input_freq as $index => $data) { $data['upsInputFrequency'] = Number::cast($data['upsInputFrequency']); discover_sensor( - $valid['sensor'], + null, 'frequency', $device, $freq_oid, @@ -42,7 +42,7 @@ if (is_numeric($output_freq)) { $divisor = get_device_divisor($device, $pre_cache['poweralert_serial'] ?? '', 'frequency', $freq_oid); discover_sensor( - $valid['sensor'], + null, 'frequency', $device, $freq_oid, @@ -65,7 +65,7 @@ if (is_numeric($bypass_freq)) { $divisor = get_device_divisor($device, $pre_cache['poweralert_serial'] ?? '', 'frequency', $freq_oid); discover_sensor( - $valid['sensor'], + null, 'frequency', $device, $freq_oid, diff --git a/includes/discovery/sensors/frequency/rs.inc.php b/includes/discovery/sensors/frequency/rs.inc.php index dbb1b4d9b3..4e8338f4fb 100644 --- a/includes/discovery/sensors/frequency/rs.inc.php +++ b/includes/discovery/sensors/frequency/rs.inc.php @@ -11,6 +11,6 @@ foreach ($oids as $id => $data) { $descr = (count($oids) > 1) ? 'Frequency ' . $id : 'Frequency'; $type = 'rs'; $current = $data['cmdExcFrequency']; - discover_sensor($valid['sensor'], 'frequency', $device, $num_oid, $index, $type, $descr, '1', '1', null, null, null, null, $current); + discover_sensor(null, 'frequency', $device, $num_oid, $index, $type, $descr, '1', '1', null, null, null, null, $current); $count++; } diff --git a/includes/discovery/sensors/frequency/sinetica.inc.php b/includes/discovery/sensors/frequency/sinetica.inc.php index 5adccaac47..6a866d9e02 100644 --- a/includes/discovery/sensors/frequency/sinetica.inc.php +++ b/includes/discovery/sensors/frequency/sinetica.inc.php @@ -32,7 +32,7 @@ if (! empty($output_current) || $output_current == 0) { $type = 'sinetica'; $index = '4.2.0'; - discover_sensor($valid['sensor'], 'frequency', $device, $output_oid, $index, $type, $descr, $divisor, '1', null, null, null, null, $current); + discover_sensor(null, 'frequency', $device, $output_oid, $index, $type, $descr, $divisor, '1', null, null, null, null, $current); } $bypass_oid = '.1.3.6.1.4.1.13891.101.5.1.0'; @@ -45,7 +45,7 @@ if (! empty($bypass_current) || $bypass_current == 0) { $type = 'sinetica'; $index = '5.1.0'; - discover_sensor($valid['sensor'], 'frequency', $device, $bypass_oid, $index, $type, $descr, $divisor, '1', null, null, null, null, $current); + discover_sensor(null, 'frequency', $device, $bypass_oid, $index, $type, $descr, $divisor, '1', null, null, null, null, $current); } $oids = snmpwalk_cache_oid_num($device, '.1.3.6.1.4.1.13891.101.3.3.1.2', []); @@ -63,5 +63,5 @@ foreach ($oids as $oid => $data) { $type = 'sinetica'; $index = '3.3.1.2.' . $current_id; - discover_sensor($valid['sensor'], 'frequency', $device, $current_oid, $index, $type, $descr, $divisor, '1', null, null, null, null, $current); + discover_sensor(null, 'frequency', $device, $current_oid, $index, $type, $descr, $divisor, '1', null, null, null, null, $current); } diff --git a/includes/discovery/sensors/gw-eydfa.inc.php b/includes/discovery/sensors/gw-eydfa.inc.php index a9d084d334..795abb45fb 100644 --- a/includes/discovery/sensors/gw-eydfa.inc.php +++ b/includes/discovery/sensors/gw-eydfa.inc.php @@ -46,7 +46,7 @@ foreach (explode("\n", $oids) as $data) { $high_warn = snmp_get($device, 'analogAlarmHI.13' . $num_oid, '-Ovq', 'NSCRTV-HFCEMS-PROPERTY-MIB') / $divisor; $high_limit = snmp_get($device, 'analogAlarmHIHI.13' . $num_oid, '-Ovq', 'NSCRTV-HFCEMS-PROPERTY-MIB') / $divisor; } - discover_sensor($valid['sensor'], 'current', $device, $num_oid, $sensor_index, 'gw-eydfa', $descr, $divisor, 1, $low_limit, $low_warn, $high_warn, $high_limit, $value); + discover_sensor(null, 'current', $device, $num_oid, $sensor_index, 'gw-eydfa', $descr, $divisor, 1, $low_limit, $low_warn, $high_warn, $high_limit, $value); } if ($split_oid[0] == 'oaPumpTEC' && $index = 1) { // Current - A $divisor = 100; @@ -60,7 +60,7 @@ foreach (explode("\n", $oids) as $data) { $high_limit = snmp_get($device, 'analogAlarmHIHI.13' . $num_oid, '-Ovq', 'NSCRTV-HFCEMS-PROPERTY-MIB') / $divisor; } $sensor_index = 'oaPumpTEC' . $index; - discover_sensor($valid['sensor'], 'current', $device, $num_oid, $sensor_index, 'gw-eydfa', $descr, $divisor, 1, $low_limit, $low_warn, $high_warn, $high_limit, $value); + discover_sensor(null, 'current', $device, $num_oid, $sensor_index, 'gw-eydfa', $descr, $divisor, 1, $low_limit, $low_warn, $high_warn, $high_limit, $value); } if ($split_oid[0] == 'oaPumpTemp' && $index = 1) { // Temperature - C $divisor = 10; @@ -74,7 +74,7 @@ foreach (explode("\n", $oids) as $data) { $high_limit = snmp_get($device, 'analogAlarmHIHI.13' . $num_oid, '-Ovq', 'NSCRTV-HFCEMS-PROPERTY-MIB') / $divisor; } $sensor_index = 'oaPumpTemp' . $index; - discover_sensor($valid['sensor'], 'temperature', $device, $num_oid, $sensor_index, 'gw-eydfa', $descr, $divisor, 1, $low_limit, $low_warn, $high_warn, $high_limit, $value); + discover_sensor(null, 'temperature', $device, $num_oid, $sensor_index, 'gw-eydfa', $descr, $divisor, 1, $low_limit, $low_warn, $high_warn, $high_limit, $value); } unset($oids, $split_oid, $index, $divisor, $descr, $low_limit, $low_warn, $high_warn, $sensor_index); } @@ -103,7 +103,7 @@ foreach (explode("\n", $oids) as $data) { } $sensor_index = 'oaDCPowerVoltage' . $index; $value = $value / $divisor; - discover_sensor($valid['sensor'], 'voltage', $device, $num_oid, $sensor_index, 'gw-eydfa', $descr, $divisor, 1, $low_limit, $low_warn, $high_warn, $high_limit, $value); + discover_sensor(null, 'voltage', $device, $num_oid, $sensor_index, 'gw-eydfa', $descr, $divisor, 1, $low_limit, $low_warn, $high_warn, $high_limit, $value); } } @@ -123,7 +123,7 @@ if (is_numeric($value)) { $high_limit = snmp_get($device, 'analogAlarmHIHI.12.1.3.6.1.4.1.17409.1.3.1.13.0', '-Ovq', 'NSCRTV-HFCEMS-PROPERTY-MIB'); } $sensor_index = 'commonDeviceInternalTemperature.1'; -discover_sensor($valid['sensor'], 'temperature', $device, $num_oid, $sensor_index, 'gw-eydfa', $descr, 1, 1, $low_limit, $low_warn, $high_warn, $high_limit, $value); +discover_sensor(null, 'temperature', $device, $num_oid, $sensor_index, 'gw-eydfa', $descr, 1, 1, $low_limit, $low_warn, $high_warn, $high_limit, $value); unset($num_oid, $value, $descr, $low_limit, $low_warn, $high_warn, $sensor_index); @@ -143,7 +143,7 @@ if (is_numeric($value)) { } $value = $value / $divisor; $sensor_index = 'oaOutputOpticalPower.0'; -discover_sensor($valid['sensor'], 'dbm', $device, $num_oid, $sensor_index, 'gw-eydfa', $descr, $divisor, 1, $low_limit, $low_warn, $high_warn, $high_limit, $value); +discover_sensor(null, 'dbm', $device, $num_oid, $sensor_index, 'gw-eydfa', $descr, $divisor, 1, $low_limit, $low_warn, $high_warn, $high_limit, $value); unset($num_oid, $value, $divisor, $descr, $low_limit, $low_warn, $high_warn, $sensor_index); @@ -163,7 +163,7 @@ if (is_numeric($value)) { } $value = $value / $divisor; $sensor_index = 'oaInputOpticalPower.0'; -discover_sensor($valid['sensor'], 'dbm', $device, $num_oid, $sensor_index, 'gw-eydfa', $descr, $divisor, 1, $low_limit, $low_warn, $high_warn, $high_limit, $value); +discover_sensor(null, 'dbm', $device, $num_oid, $sensor_index, 'gw-eydfa', $descr, $divisor, 1, $low_limit, $low_warn, $high_warn, $high_limit, $value); unset($num_oid, $value, $divisor, $descr, $low_limit, $low_warn, $high_warn, $sensor_index); @@ -185,7 +185,7 @@ foreach ($oids as $oid) { $value = snmp_get($device, $oid, '-Ovq', 'NSCRTV-HFCEMS-PROPERTY-MIB'); $descr = 'Power Supply ' . $n; $sensor_index = 'PowerSupplyState' . $n; - discover_sensor($valid['sensor'], 'state', $device, $oid, $sensor_index, $state_name, $descr, 1, 1, null, null, null, null, $value, 'snmp'); + discover_sensor(null, 'state', $device, $oid, $sensor_index, $state_name, $descr, 1, 1, null, null, null, null, $value, 'snmp'); create_sensor_to_state_index($device, $state_name, $sensor_index); $n++; } diff --git a/includes/discovery/sensors/humidity/aos-emu2.inc.php b/includes/discovery/sensors/humidity/aos-emu2.inc.php index 2a86f84dd6..6dbd368882 100644 --- a/includes/discovery/sensors/humidity/aos-emu2.inc.php +++ b/includes/discovery/sensors/humidity/aos-emu2.inc.php @@ -32,6 +32,6 @@ foreach ($pre_cache['emu2_temp'] as $id => $temp) { $high_limit = $temp['emsProbeStatusProbeMaxHumidityThresh']; $high_warn_limit = $temp['emsProbeStatusProbeHighHumidityThresh']; $current = $temp['emsProbeStatusProbeHumidity']; - discover_sensor($valid['sensor'], 'humidity', $device, $oid, $index, 'aos-emu2', $descr, '1', '1', $low_limit, $low_warn_limit, $high_warn_limit, $high_limit, $current); + discover_sensor(null, 'humidity', $device, $oid, $index, 'aos-emu2', $descr, '1', '1', $low_limit, $low_warn_limit, $high_warn_limit, $high_limit, $current); } } diff --git a/includes/discovery/sensors/humidity/apc.inc.php b/includes/discovery/sensors/humidity/apc.inc.php index 10d9d31fbf..0b090e4b35 100644 --- a/includes/discovery/sensors/humidity/apc.inc.php +++ b/includes/discovery/sensors/humidity/apc.inc.php @@ -27,7 +27,7 @@ if ($apc_env_data) { if (count($split_index) == 2 && $split_index[1] == 1) { $index = $split_index[0]; } - discover_sensor($valid['sensor'], 'humidity', $device, $oid, $index, $sensorType, $descr, '1', '1', $low_limit, $low_warn_limit, $high_warn_limit, $high_limit, $current); + discover_sensor(null, 'humidity', $device, $oid, $index, $sensorType, $descr, '1', '1', $low_limit, $low_warn_limit, $high_warn_limit, $high_limit, $current); } } } else { @@ -47,7 +47,7 @@ if ($apc_env_data) { if ($current > 0) { // Humidity = 0 -> Sensor not available - discover_sensor($valid['sensor'], 'humidity', $device, $oid, $index, $sensorType, $descr, '1', '1', $low_limit, $low_warn_limit, $high_warn_limit, $high_limit, $current); + discover_sensor(null, 'humidity', $device, $oid, $index, $sensorType, $descr, '1', '1', $low_limit, $low_warn_limit, $high_warn_limit, $high_limit, $current); } } } @@ -66,7 +66,7 @@ foreach (array_keys($apc_env_data) as $index) { $high_limit = $apc_env_data[$index]['emsProbeStatusProbeMaxHumidityThresh']; if ($current > 0) { - discover_sensor($valid['sensor'], 'humidity', $device, $oid, $index, $sensorType, $descr, '1', '1', $low_limit, $low_warn_limit, $high_warn_limit, $high_limit, $current); + discover_sensor(null, 'humidity', $device, $oid, $index, $sensorType, $descr, '1', '1', $low_limit, $low_warn_limit, $high_warn_limit, $high_limit, $current); } } } @@ -78,6 +78,6 @@ foreach ($pre_cache['mem_sensors_status'] as $index => $data) { $multiplier = 1; $value = $data['memSensorsHumidity']; if (is_numeric($value)) { - discover_sensor($valid['sensor'], 'humidity', $device, $cur_oid, 'memSensorsHumidity.' . $index, 'apc', $descr, $divisor, $multiplier, null, null, null, null, $value); + discover_sensor(null, 'humidity', $device, $cur_oid, 'memSensorsHumidity.' . $index, 'apc', $descr, $divisor, $multiplier, null, null, null, null, $value); } } diff --git a/includes/discovery/sensors/humidity/geist-watchdog.inc.php b/includes/discovery/sensors/humidity/geist-watchdog.inc.php index 5c01b109cf..16e1b4e558 100644 --- a/includes/discovery/sensors/humidity/geist-watchdog.inc.php +++ b/includes/discovery/sensors/humidity/geist-watchdog.inc.php @@ -29,5 +29,5 @@ $value = Number::cast(SnmpQuery::get('GEIST-MIB-V3::climateHumidity')->value()); if ($value) { $current_oid = '.1.3.6.1.4.1.21239.2.2.1.7.1'; $descr = 'Humidity'; - discover_sensor($valid['sensor'], 'humidity', $device, $current_oid, 'climateHumidity', 'geist-watchdog', $descr, 1, 1, null, null, null, null, $value); + discover_sensor(null, 'humidity', $device, $current_oid, 'climateHumidity', 'geist-watchdog', $descr, 1, 1, null, null, null, null, $value); } diff --git a/includes/discovery/sensors/humidity/ipoman.inc.php b/includes/discovery/sensors/humidity/ipoman.inc.php index fdece12a1c..535f9260ae 100644 --- a/includes/discovery/sensors/humidity/ipoman.inc.php +++ b/includes/discovery/sensors/humidity/ipoman.inc.php @@ -15,6 +15,6 @@ if ($emd_installed == 'eMD-HT') { $current_oid = '.1.3.6.1.4.1.2468.1.4.2.1.5.1.1.3.0'; $descr = trim(str_replace('"', '', $descr)); - discover_sensor($valid['sensor'], 'humidity', $device, $current_oid, '1', 'ipoman', $descr, '10', '1', $low_limit, null, null, $high_limit, $current); + discover_sensor(null, 'humidity', $device, $current_oid, '1', 'ipoman', $descr, '10', '1', $low_limit, null, null, $high_limit, $current); } } diff --git a/includes/discovery/sensors/humidity/liebert.inc.php b/includes/discovery/sensors/humidity/liebert.inc.php index ea46547408..2afa891a34 100644 --- a/includes/discovery/sensors/humidity/liebert.inc.php +++ b/includes/discovery/sensors/humidity/liebert.inc.php @@ -43,7 +43,7 @@ foreach ($lib_data as $index => $data) { if (is_numeric($current)) { $descr = $data['lgpEnvHumidityDescrRel']; - discover_sensor($valid['sensor'], 'humidity', $device, $oid, $new_index, 'liebert', $descr, $divisor, 1, $low_limit, null, null, $high_limit, $current / $divisor); + discover_sensor(null, 'humidity', $device, $oid, $new_index, 'liebert', $descr, $divisor, 1, $low_limit, null, null, $high_limit, $current / $divisor); } } @@ -63,7 +63,7 @@ if (is_numeric($return_humidity)) { $oid = '.1.3.6.1.4.1.476.1.42.3.4.2.1.2.0'; $index = 'lgpEnvReturnAirHumidity.0'; $descr = 'Return Air Humidity'; - discover_sensor($valid['sensor'], 'humidity', $device, $oid, $index, 'liebert', $descr, $divisor, '1', null, null, null, null, $return_humidity); + discover_sensor(null, 'humidity', $device, $oid, $index, 'liebert', $descr, $divisor, '1', null, null, null, null, $return_humidity); } $supply_humidity = snmp_get($device, 'lgpEnvSupplyAirHumidity.0', '-Oqv'); @@ -71,5 +71,5 @@ if (is_numeric($supply_humidity)) { $oid = '.1.3.6.1.4.1.476.1.42.3.4.2.1.3.0'; $index = 'lgpEnvSupplyAirHumidity.0'; $descr = 'Supply Air Humidity'; - discover_sensor($valid['sensor'], 'humidity', $device, $oid, $index, 'liebert', $descr, $divisor, '1', null, null, null, null, $supply_humidity); + discover_sensor(null, 'humidity', $device, $oid, $index, 'liebert', $descr, $divisor, '1', null, null, null, null, $supply_humidity); } diff --git a/includes/discovery/sensors/humidity/mgeups.inc.php b/includes/discovery/sensors/humidity/mgeups.inc.php index 0d008d202b..06d22736ad 100644 --- a/includes/discovery/sensors/humidity/mgeups.inc.php +++ b/includes/discovery/sensors/humidity/mgeups.inc.php @@ -52,6 +52,6 @@ foreach (array_keys($mge_env_data) as $index) { if ($current != 0) { // Humidity = 0 -> Sensor not available // FIXME true for MGE as wel as APC? - discover_sensor($valid['sensor'], 'humidity', $device, $oid, $index, $sensorType, $descr, '1', '1', $low_limit, $low_warn_limit, $high_warn_limit, $high_limit, $current); + discover_sensor(null, 'humidity', $device, $oid, $index, $sensorType, $descr, '1', '1', $low_limit, $low_warn_limit, $high_warn_limit, $high_limit, $current); } }//end foreach diff --git a/includes/discovery/sensors/humidity/minkelsrms.inc.php b/includes/discovery/sensors/humidity/minkelsrms.inc.php index 7c35db4347..c461168680 100644 --- a/includes/discovery/sensors/humidity/minkelsrms.inc.php +++ b/includes/discovery/sensors/humidity/minkelsrms.inc.php @@ -30,7 +30,7 @@ foreach (explode("\n", $oids) as $data) { $lowlimit = snmp_get($device, $lowlimit_oid, '-Oqv', ''); $warnlowlimit = snmp_get($device, $warnlowlimit_oid, '-Oqv', ''); - discover_sensor($valid['sensor'], 'humidity', $device, $oid, $index, 'akcp', $descr, '1', '1', $lowlimit, $warnlowlimit, $limit, $warnlimit, $humidity); + discover_sensor(null, 'humidity', $device, $oid, $index, 'akcp', $descr, '1', '1', $lowlimit, $warnlowlimit, $limit, $warnlimit, $humidity); } } } diff --git a/includes/discovery/sensors/humidity/pcoweb.inc.php b/includes/discovery/sensors/humidity/pcoweb.inc.php index a303601abe..f1713e7af9 100644 --- a/includes/discovery/sensors/humidity/pcoweb.inc.php +++ b/includes/discovery/sensors/humidity/pcoweb.inc.php @@ -43,6 +43,6 @@ foreach ($humidities as $humidity) { if (is_numeric($current) && $current != 0) { $index = implode('.', array_slice(explode('.', $humidity['oid']), -5)); - discover_sensor($valid['sensor'], 'humidity', $device, $humidity['oid'], $index, 'pcoweb', $humidity['descr'], $humidity['precision'], '1', $low_limit, null, null, $high_limit, $current); + discover_sensor(null, 'humidity', $device, $humidity['oid'], $index, 'pcoweb', $humidity['descr'], $humidity['precision'], '1', $low_limit, null, null, $high_limit, $current); } } diff --git a/includes/discovery/sensors/humidity/raritan-pdu.inc.php b/includes/discovery/sensors/humidity/raritan-pdu.inc.php index 12bd2514a3..9997e8c6d9 100644 --- a/includes/discovery/sensors/humidity/raritan-pdu.inc.php +++ b/includes/discovery/sensors/humidity/raritan-pdu.inc.php @@ -41,7 +41,7 @@ foreach ($pre_cache['raritan_extSensorConfig'] as $index => $data) { $sensor_available = $measure_data['measurementsExternalSensorIsAvailable']; $user_func = null; if (is_numeric($current) && $current >= 0 && $sensor_available === 'true') { - discover_sensor($valid['sensor'], 'humidity', $device, $oid, 'measurementsExternalSensorValue.' . $index, 'raritan', $descr, $divisor, $multiplier, $low_limit, $low_warn_limit, $high_warn_limit, $high_limit, $current, 'snmp', null, null, $user_func); + discover_sensor(null, 'humidity', $device, $oid, 'measurementsExternalSensorValue.' . $index, 'raritan', $descr, $divisor, $multiplier, $low_limit, $low_warn_limit, $high_warn_limit, $high_limit, $current, 'snmp', null, null, $user_func); } } } @@ -60,7 +60,7 @@ foreach ($oids as $index => $sensor) { $limit_low_warn = $sensor['externalSensorLowerCriticalThreshold'] / $divisor; $offset++; if (is_numeric($hum_current) && $hum_current >= 0) { - discover_sensor($valid['sensor'], 'humidity', $device, $oid, $offset, 'raritan', $descr, $divisor, $multiplier, $limit_low, $limit_low_warn, $limit_high_warn, $limit_high, $hum_current); + discover_sensor(null, 'humidity', $device, $oid, $offset, 'raritan', $descr, $divisor, $multiplier, $limit_low, $limit_low_warn, $limit_high_warn, $limit_high, $hum_current); } } } diff --git a/includes/discovery/sensors/humidity/sentry3.inc.php b/includes/discovery/sensors/humidity/sentry3.inc.php index 5ef2eb63b1..e480f0adbe 100644 --- a/includes/discovery/sensors/humidity/sentry3.inc.php +++ b/includes/discovery/sensors/humidity/sentry3.inc.php @@ -19,7 +19,7 @@ if ($oids) { $current = $data['tempHumidSensorHumidValue']; if (is_numeric($current) && $current >= 0) { - discover_sensor($valid['sensor'], 'humidity', $device, $humidity_oid, 'tempHumidSensorHumidValue' . $sensor_index, 'sentry3', $descr, $divisor, $multiplier, $low_limit, $low_warn_limit, $high_warn_limit, $high_limit, $current); + discover_sensor(null, 'humidity', $device, $humidity_oid, 'tempHumidSensorHumidValue' . $sensor_index, 'sentry3', $descr, $divisor, $multiplier, $low_limit, $low_warn_limit, $high_warn_limit, $high_limit, $current); } } } diff --git a/includes/discovery/sensors/humidity/sentry4.inc.php b/includes/discovery/sensors/humidity/sentry4.inc.php index b88c8abceb..4ac940967f 100644 --- a/includes/discovery/sensors/humidity/sentry4.inc.php +++ b/includes/discovery/sensors/humidity/sentry4.inc.php @@ -31,6 +31,6 @@ foreach ($pre_cache['sentry4_humid'] as $index => $data) { $high_warn_limit = $data['st4HumidSensorHighWarning']; $current = $data['st4HumidSensorValue']; if ($current >= 0) { - discover_sensor($valid['sensor'], 'humidity', $device, $oid, "st4HumidSensorValue.$index", 'sentry4', $descr, 1, 1, $low_limit, $low_warn_limit, $high_warn_limit, $high_limit, $current); + discover_sensor(null, 'humidity', $device, $oid, "st4HumidSensorValue.$index", 'sentry4', $descr, 1, 1, $low_limit, $low_warn_limit, $high_warn_limit, $high_limit, $current); } } diff --git a/includes/discovery/sensors/humidity/serverscheck.inc.php b/includes/discovery/sensors/humidity/serverscheck.inc.php index faa7b637de..d5bcf2b743 100644 --- a/includes/discovery/sensors/humidity/serverscheck.inc.php +++ b/includes/discovery/sensors/humidity/serverscheck.inc.php @@ -42,7 +42,7 @@ foreach ($pre_cache['serverscheck_control'] as $oid_name => $oid_value) { if (is_numeric($current)) { $index = str_replace('.0', '', $oid_name); $descr = $oid_value; - discover_sensor($valid['sensor'], 'humidity', $device, $serverscheck_oids[$tmp_oid], $index, 'serverscheck', $descr, 1, 1, null, null, null, null, $current); + discover_sensor(null, 'humidity', $device, $serverscheck_oids[$tmp_oid], $index, 'serverscheck', $descr, 1, 1, null, null, null, null, $current); } } $temp_x++; diff --git a/includes/discovery/sensors/humidity/webmon.inc.php b/includes/discovery/sensors/humidity/webmon.inc.php index ba15b7817a..bf6634b1fe 100644 --- a/includes/discovery/sensors/humidity/webmon.inc.php +++ b/includes/discovery/sensors/humidity/webmon.inc.php @@ -39,7 +39,7 @@ foreach ($prefixes as $prefix => $numOidPrefix) { $lowWarnLimit = $oid[$prefix . 'Thresh3']; $highLimit = $oid[$prefix . 'Thresh1']; $highWarnLimit = $oid[$prefix . 'Thresh2']; - discover_sensor($valid['sensor'], 'humidity', $device, $num_oid, $prefix . 'LiveRaw.' . $index, 'webmon', $descr, '1', '1', $lowLimit, $lowWarnLimit, $highWarnLimit, $highLimit, $value, 'snmp', null, null, null, $group); + discover_sensor(null, 'humidity', $device, $num_oid, $prefix . 'LiveRaw.' . $index, 'webmon', $descr, '1', '1', $lowLimit, $lowWarnLimit, $highWarnLimit, $highLimit, $value, 'snmp', null, null, null, $group); } } } diff --git a/includes/discovery/sensors/humidity/websensor.inc.php b/includes/discovery/sensors/humidity/websensor.inc.php index 30c8fb971c..4c0866b9af 100644 --- a/includes/discovery/sensors/humidity/websensor.inc.php +++ b/includes/discovery/sensors/humidity/websensor.inc.php @@ -29,5 +29,5 @@ if (is_numeric($pre_cache['websensor_valuesInt']['humInt.0'])) { $humidity = $pre_cache['websensor_valuesInt']['humInt.0'] / 10; $high_limit = $pre_cache['websensor_settings']['humHighInt.0'] / 10; $low_limit = $pre_cache['websensor_settings']['humLowInt.0'] / 10; - discover_sensor($valid['sensor'], 'humidity', $device, $humidity_oid, $humidity_index, 'websensor', $descr, '10', '1', $low_limit, null, null, $high_limit, $humidity); + discover_sensor(null, 'humidity', $device, $humidity_oid, $humidity_index, 'websensor', $descr, '10', '1', $low_limit, null, null, $high_limit, $humidity); } diff --git a/includes/discovery/sensors/ipmi.inc.php b/includes/discovery/sensors/ipmi.inc.php index 7c8f46251d..25a1519709 100644 --- a/includes/discovery/sensors/ipmi.inc.php +++ b/includes/discovery/sensors/ipmi.inc.php @@ -45,7 +45,7 @@ if ($ipmi['host'] = get_dev_attrib($device, 'ipmi_hostname')) { $index++; if ($current != 'na' && Config::has("ipmi_unit.$unit")) { discover_sensor( - $valid['sensor'], + null, Config::get("ipmi_unit.$unit"), $device, $desc, @@ -67,7 +67,8 @@ if ($ipmi['host'] = get_dev_attrib($device, 'ipmi_hostname')) { echo "\n"; } -check_valid_sensors($device, 'voltage', $valid['sensor'], 'ipmi'); -check_valid_sensors($device, 'temperature', $valid['sensor'], 'ipmi'); -check_valid_sensors($device, 'fanspeed', $valid['sensor'], 'ipmi'); -check_valid_sensors($device, 'power', $valid['sensor'], 'ipmi'); +$sensorDiscovery = app('sensor-discovery'); +$sensorDiscovery->sync(sensor_class: 'voltage', poller_type: 'ipmi'); +$sensorDiscovery->sync(sensor_class: 'temperature', poller_type: 'ipmi'); +$sensorDiscovery->sync(sensor_class: 'fanspeed', poller_type: 'ipmi'); +$sensorDiscovery->sync(sensor_class: 'power', poller_type: 'ipmi'); diff --git a/includes/discovery/sensors/load/apc.inc.php b/includes/discovery/sensors/load/apc.inc.php index fc3adabad7..4c328ea1fd 100644 --- a/includes/discovery/sensors/load/apc.inc.php +++ b/includes/discovery/sensors/load/apc.inc.php @@ -13,7 +13,7 @@ if ($phasecount > 1) { $divisor = 1; $load = $data['upsPhaseOutputPercentLoad']; if ($load >= 0) { - discover_sensor($valid['sensor'], 'load', $device, $load_oid, $index, $type, $descr, $divisor, 1, null, null, null, null, $load); + discover_sensor(null, 'load', $device, $load_oid, $index, $type, $descr, $divisor, 1, null, null, null, null, $load); } } unset($oids); @@ -47,7 +47,7 @@ if ($phasecount > 1) { if ($oids) { echo $item['type'] . ' ' . $item['mib'] . ' UPS'; } - discover_sensor($valid['sensor'], 'load', $device, $current_oid . '.' . $item['index'], $current_oid . '.' . $item['index'], $item['type'], $item['descr'], $item['divisor'], 1, null, null, null, null, $current); + discover_sensor(null, 'load', $device, $current_oid . '.' . $item['index'], $current_oid . '.' . $item['index'], $item['type'], $item['descr'], $item['divisor'], 1, null, null, null, null, $current); } }//end foreach } diff --git a/includes/discovery/sensors/load/dhcpatriot.inc.php b/includes/discovery/sensors/load/dhcpatriot.inc.php index 9614422895..b3a5cbcb45 100644 --- a/includes/discovery/sensors/load/dhcpatriot.inc.php +++ b/includes/discovery/sensors/load/dhcpatriot.inc.php @@ -75,7 +75,7 @@ if (! empty($dhcp_networks[$dhcp_networks_base_oid])) { $group = $value['group']; discover_sensor( - $valid['sensor'], + null, $class, $device, $oid, diff --git a/includes/discovery/sensors/load/dsm.inc.php b/includes/discovery/sensors/load/dsm.inc.php index 49b08647a0..13c1116108 100644 --- a/includes/discovery/sensors/load/dsm.inc.php +++ b/includes/discovery/sensors/load/dsm.inc.php @@ -29,5 +29,5 @@ $ups_device_model = str_replace('"', '', snmp_get($device, $ups_device_model_oid $ups_load_oid = '.1.3.6.1.4.1.6574.4.2.12.1.0'; $ups_load = snmp_get($device, $ups_load_oid, '-Oqv'); if (is_numeric($ups_load)) { - discover_sensor($valid['sensor'], 'load', $device, $ups_load_oid, 0, 'snmp', $ups_device_manufacturer . ' ' . $ups_device_model . ' - UPS Load', '1', '1', 0, null, null, 100, intval($ups_load)); + discover_sensor(null, 'load', $device, $ups_load_oid, 0, 'snmp', $ups_device_manufacturer . ' ' . $ups_device_model . ' - UPS Load', '1', '1', 0, null, null, 100, intval($ups_load)); } diff --git a/includes/discovery/sensors/load/infinera-groove.inc.php b/includes/discovery/sensors/load/infinera-groove.inc.php index b16d4fae2b..e5af9612e1 100644 --- a/includes/discovery/sensors/load/infinera-groove.inc.php +++ b/includes/discovery/sensors/load/infinera-groove.inc.php @@ -28,7 +28,7 @@ foreach ($pre_cache['infineragroove_slotTable'] as $index => $data) { $descr = 'Chassis fan ' . $infinera_slot; $oid = '.1.3.6.1.4.1.42229.1.2.3.3.1.1.7.' . $index; $value = $data['cardFanSpeedRate']; - discover_sensor($valid['sensor'], 'load', $device, $oid, 'cardFanSpeedRate.' . $index, 'infinera-groove', $descr, null, '1', 0, 20, 80, 100, $value); + discover_sensor(null, 'load', $device, $oid, 'cardFanSpeedRate.' . $index, 'infinera-groove', $descr, null, '1', 0, 20, 80, 100, $value); } } diff --git a/includes/discovery/sensors/load/netagent2.inc.php b/includes/discovery/sensors/load/netagent2.inc.php index 7efdd08eee..b916b4a256 100644 --- a/includes/discovery/sensors/load/netagent2.inc.php +++ b/includes/discovery/sensors/load/netagent2.inc.php @@ -48,7 +48,7 @@ if ($in_phaseNum == '1') { $descr = 'Output load'; discover_sensor( - $valid['sensor'], + null, 'load', $device, $load_oid, @@ -84,7 +84,7 @@ if ($in_phaseNum == '3') { $descr = 'Out L1 (R)'; discover_sensor( - $valid['sensor'], + null, 'load', $device, $load_oid, @@ -116,7 +116,7 @@ if ($in_phaseNum == '3') { $descr = 'Out L2 (S)'; discover_sensor( - $valid['sensor'], + null, 'load', $device, $load_oid, @@ -148,7 +148,7 @@ if ($in_phaseNum == '3') { $descr = 'Out L3 (T)'; discover_sensor( - $valid['sensor'], + null, 'load', $device, $load_oid, diff --git a/includes/discovery/sensors/load/rfc1628.inc.php b/includes/discovery/sensors/load/rfc1628.inc.php index 14b4db452f..0aa0fcab8a 100644 --- a/includes/discovery/sensors/load/rfc1628.inc.php +++ b/includes/discovery/sensors/load/rfc1628.inc.php @@ -24,7 +24,7 @@ foreach ($load_data as $index => $data) { $value = Number::cast($value); discover_sensor( - $valid['sensor'], + null, 'load', $device, $load_oid, diff --git a/includes/discovery/sensors/load/sinetica.inc.php b/includes/discovery/sensors/load/sinetica.inc.php index f4f5bf9f77..405f71cb05 100644 --- a/includes/discovery/sensors/load/sinetica.inc.php +++ b/includes/discovery/sensors/load/sinetica.inc.php @@ -36,5 +36,5 @@ foreach ($oids as $oid => $data) { $type = 'sinetica'; $index = '4.4.1.5.' . $current_id; - discover_sensor($valid['sensor'], 'load', $device, $current_oid, $index, $type, $descr, 1, 1, null, null, null, null, $current); + discover_sensor(null, 'load', $device, $current_oid, $index, $type, $descr, 1, 1, null, null, null, null, $current); } diff --git a/includes/discovery/sensors/load/unix.inc.php b/includes/discovery/sensors/load/unix.inc.php index d32b3c7bbb..2c95b147a1 100644 --- a/includes/discovery/sensors/load/unix.inc.php +++ b/includes/discovery/sensors/load/unix.inc.php @@ -36,7 +36,7 @@ if (! empty($snmpData)) { if (! empty($value)) { $oid = Oid::toNumeric('NET-SNMP-EXTEND-MIB::nsExtendOutLine."ups-nut".' . $index); discover_sensor( - $valid['sensor'], + null, 'load', $device, $oid, diff --git a/includes/discovery/sensors/netscaler.inc.php b/includes/discovery/sensors/netscaler.inc.php index 00937122bb..446cf330a4 100644 --- a/includes/discovery/sensors/netscaler.inc.php +++ b/includes/discovery/sensors/netscaler.inc.php @@ -30,7 +30,7 @@ foreach ($ns_sensor_array as $descr => $data) { if (is_numeric($current) && $type) { discover_sensor( - $valid['sensor'], + null, $type, $device, $oid, diff --git a/includes/discovery/sensors/openbsd.inc.php b/includes/discovery/sensors/openbsd.inc.php index 5b334e0be1..3ee1a12ddb 100644 --- a/includes/discovery/sensors/openbsd.inc.php +++ b/includes/discovery/sensors/openbsd.inc.php @@ -54,7 +54,7 @@ if (is_array($oids)) { // echo($descr . "|" . $index . "|" .$current . "|" . $bogus . "\n"); if (! $bogus) { - discover_sensor($valid['sensor'], $type, $device, $oid, $index, 'openbsd-sensor', $descr, '1', '1', null, null, null, null, $current); + discover_sensor(null, $type, $device, $oid, $index, 'openbsd-sensor', $descr, '1', '1', null, null, null, null, $current); } }//end if }//end foreach diff --git a/includes/discovery/sensors/percent/fortigate.inc.php b/includes/discovery/sensors/percent/fortigate.inc.php index ab8e16e02d..f03949d126 100644 --- a/includes/discovery/sensors/percent/fortigate.inc.php +++ b/includes/discovery/sensors/percent/fortigate.inc.php @@ -25,7 +25,7 @@ if (! empty($fgDhcpTables)) { $fgDhcpServerID = $indexSplit[1]; discover_sensor( - $valid['sensor'], + null, 'percent', $device, '.1.3.6.1.4.1.12356.101.23.2.1.1.2.' . $index, diff --git a/includes/discovery/sensors/power/apc.inc.php b/includes/discovery/sensors/power/apc.inc.php index 1e5c685b76..461fa8a819 100644 --- a/includes/discovery/sensors/power/apc.inc.php +++ b/includes/discovery/sensors/power/apc.inc.php @@ -28,6 +28,6 @@ foreach ($pre_cache['cooling_unit_analog'] as $index => $data) { $scale = $data['coolingUnitStatusAnalogScale'] ?? null; $value = $data['coolingUnitStatusAnalogValue'] ?? null; if (preg_match('/Cool/', $descr) && $data['coolingUnitStatusAnalogUnits'] == 'kW' && $value >= 0) { - discover_sensor($valid['sensor'], 'power', $device, $cur_oid, $cur_oid, 'apc', $descr, $scale, 1, null, null, null, null, $value); + discover_sensor(null, 'power', $device, $cur_oid, $cur_oid, 'apc', $descr, $scale, 1, null, null, null, null, $value); } } diff --git a/includes/discovery/sensors/power/ciscosb.inc.php b/includes/discovery/sensors/power/ciscosb.inc.php index f21847baa7..30f15a603d 100644 --- a/includes/discovery/sensors/power/ciscosb.inc.php +++ b/includes/discovery/sensors/power/ciscosb.inc.php @@ -20,7 +20,7 @@ if (is_array($temp)) { $port_descr = get_port_by_index_cache($device['device_id'], preg_replace('/^\d+\./', '', $index)); $descr = trim($port_descr['ifDescr'] . ' PoE'); $highlimit = isset($temp[$index]['rlPethPsePortOperPowerLimit']) ? $temp[$index]['rlPethPsePortOperPowerLimit'] / $divisor : null; - discover_sensor($valid['sensor'], 'power', $device, $cur_oid . $index, $index, 'ciscosb', $descr, $divisor, '1', null, null, null, $highlimit, $temp[$index]['rlPethPsePortOutputPower'] / $divisor, 'snmp', $index); + discover_sensor(null, 'power', $device, $cur_oid . $index, $index, 'ciscosb', $descr, $divisor, '1', null, null, null, $highlimit, $temp[$index]['rlPethPsePortOutputPower'] / $divisor, 'snmp', $index); } } } diff --git a/includes/discovery/sensors/power/dell-ups.inc.php b/includes/discovery/sensors/power/dell-ups.inc.php index 5db68fc4a9..95df216a74 100644 --- a/includes/discovery/sensors/power/dell-ups.inc.php +++ b/includes/discovery/sensors/power/dell-ups.inc.php @@ -15,5 +15,5 @@ $temp = snmp_get($device, 'physicalOutputPresentConsumption.0', '-Ovqe', 'DELL-S if (is_numeric($temp) && ! is_null($temp)) { $oid = '.1.3.6.1.4.1.674.10902.2.120.2.6.0'; $descr = 'System Consumption'; - discover_sensor($valid['sensor'], 'power', $device, $oid, '0', 'dell-ups', $descr, '1', '1', null, null, null, null, $temp); + discover_sensor(null, 'power', $device, $oid, '0', 'dell-ups', $descr, '1', '1', null, null, null, null, $temp); } diff --git a/includes/discovery/sensors/power/dell.inc.php b/includes/discovery/sensors/power/dell.inc.php index c16abf91b9..2dc29a6916 100644 --- a/includes/discovery/sensors/power/dell.inc.php +++ b/includes/discovery/sensors/power/dell.inc.php @@ -35,7 +35,7 @@ foreach ((array) $temp as $index => $entry) { $warnlimit = $entry['amperageProbeUpperNonCriticalThreshold'] / $divisor; $limit = $entry['amperageProbeUpperCriticalThreshold'] / $divisor; - discover_sensor($valid['sensor'], 'power', $device, $cur_oid . $index, $index, 'dell', $descr, $divisor, '1', $lowlimit, $low_warn_limit, $warnlimit, $limit, $value, 'snmp', $index); + discover_sensor(null, 'power', $device, $cur_oid . $index, $index, 'dell', $descr, $divisor, '1', $lowlimit, $low_warn_limit, $warnlimit, $limit, $value, 'snmp', $index); } } diff --git a/includes/discovery/sensors/power/dsm.inc.php b/includes/discovery/sensors/power/dsm.inc.php index 6a94156d1c..c0e0485835 100644 --- a/includes/discovery/sensors/power/dsm.inc.php +++ b/includes/discovery/sensors/power/dsm.inc.php @@ -24,5 +24,5 @@ $ups_device_model = str_replace('"', '', snmp_get($device, $ups_device_model_oid $ups_real_power_nominal_oid = '.1.3.6.1.4.1.6574.4.2.21.2.0'; $ups_real_power_nominal = snmp_get($device, $ups_real_power_nominal_oid, '-Oqv'); if (is_numeric($ups_real_power_nominal)) { - discover_sensor($valid['sensor'], 'power', $device, $ups_real_power_nominal_oid, 'UPSRealPowerNominal', $ups_device_manufacturer . ' ' . $ups_device_model, 'UPS Real Power Nominal', '1', '1', null, null, null, null, $ups_real_power_nominal); + discover_sensor(null, 'power', $device, $ups_real_power_nominal_oid, 'UPSRealPowerNominal', $ups_device_manufacturer . ' ' . $ups_device_model, 'UPS Real Power Nominal', '1', '1', null, null, null, null, $ups_real_power_nominal); } diff --git a/includes/discovery/sensors/power/eatonups.inc.php b/includes/discovery/sensors/power/eatonups.inc.php index 2997a19b8c..9cc94e1d64 100644 --- a/includes/discovery/sensors/power/eatonups.inc.php +++ b/includes/discovery/sensors/power/eatonups.inc.php @@ -8,5 +8,5 @@ $value = snmp_get($device, $oid, '-Oqv'); $divisor = '1'; if (is_numeric($value)) { $value = ($value / $divisor); - discover_sensor($valid['sensor'], 'power', $device, $oid, '1', 'eatonups', $descr, $divisor, 1, null, null, null, null, $value); // No limits have been specified since all equipment is different and will use different amount of Watts + discover_sensor(null, 'power', $device, $oid, '1', 'eatonups', $descr, $divisor, 1, null, null, null, null, $value); // No limits have been specified since all equipment is different and will use different amount of Watts } diff --git a/includes/discovery/sensors/power/eltex-mes23xx.inc.php b/includes/discovery/sensors/power/eltex-mes23xx.inc.php index 2c31f7eefa..a3151b17ab 100644 --- a/includes/discovery/sensors/power/eltex-mes23xx.inc.php +++ b/includes/discovery/sensors/power/eltex-mes23xx.inc.php @@ -38,7 +38,7 @@ if ($pre_cache['eltex-mes23xx-poe']) { $descr = $tmp['ifName']; $oid = '.1.3.6.1.4.1.89.108.1.1.5.' . $unit . '.' . $ifIndex; discover_sensor( - $valid['sensor'], + null, 'power', $device, $oid, diff --git a/includes/discovery/sensors/power/enlogic-pdu.inc.php b/includes/discovery/sensors/power/enlogic-pdu.inc.php index 6591b7c35d..1abce9c686 100644 --- a/includes/discovery/sensors/power/enlogic-pdu.inc.php +++ b/includes/discovery/sensors/power/enlogic-pdu.inc.php @@ -28,7 +28,7 @@ foreach ($pre_cache['enlogic_pdu_status'] as $index => $data) { $descr = "Active power #$index"; $oid = '.1.3.6.1.4.1.38446.1.2.4.1.4.' . $index; if ($current > 0) { - discover_sensor($valid['sensor'], 'power', $device, $oid, $index, 'enlogic-pdu', $descr, 1, 1, null, null, null, null, $current); + discover_sensor(null, 'power', $device, $oid, $index, 'enlogic-pdu', $descr, 1, 1, null, null, null, null, $current); } } } @@ -40,7 +40,7 @@ foreach ($pre_cache['enlogic_pdu_input'] as $index => $data) { $descr = 'Input Phase #' . $index; $oid = '.1.3.6.1.4.1.38446.1.3.4.1.7.' . $index; if ($current > 0) { - discover_sensor($valid['sensor'], 'power', $device, $oid, $tmp_index, 'enlogic-pdu', $descr, 1, 1, null, null, null, null, $current); + discover_sensor(null, 'power', $device, $oid, $tmp_index, 'enlogic-pdu', $descr, 1, 1, null, null, null, null, $current); } } } diff --git a/includes/discovery/sensors/power/geist-pdu.inc.php b/includes/discovery/sensors/power/geist-pdu.inc.php index 7233414ed0..79814048fa 100644 --- a/includes/discovery/sensors/power/geist-pdu.inc.php +++ b/includes/discovery/sensors/power/geist-pdu.inc.php @@ -28,7 +28,7 @@ foreach ($pre_cache['geist_pdu_iec'] as $index => $data) { $descr = $data['ctrl3ChIECName'] . ' Phase A'; $oid = $current_oid . $index; if ($value > 0) { - discover_sensor($valid['sensor'], 'power', $device, $oid, 'ctrl3ChIECRealPowerA', 'geist-pdu', $descr, 1, 1, null, null, null, null, $value); + discover_sensor(null, 'power', $device, $oid, 'ctrl3ChIECRealPowerA', 'geist-pdu', $descr, 1, 1, null, null, null, null, $value); } $value = $data['ctrl3ChIECRealPowerB'] / $divisor; @@ -36,7 +36,7 @@ foreach ($pre_cache['geist_pdu_iec'] as $index => $data) { $descr = $data['ctrl3ChIECName'] . ' Phase B'; $oid = $current_oid . $index; if ($value > 0) { - discover_sensor($valid['sensor'], 'power', $device, $oid, 'ctrl3ChIECRealPowerB', 'geist-pdu', $descr, 1, 1, null, null, null, null, $value); + discover_sensor(null, 'power', $device, $oid, 'ctrl3ChIECRealPowerB', 'geist-pdu', $descr, 1, 1, null, null, null, null, $value); } $value = $data['ctrl3ChIECRealPowerC'] / $divisor; @@ -44,6 +44,6 @@ foreach ($pre_cache['geist_pdu_iec'] as $index => $data) { $descr = $data['ctrl3ChIECName'] . ' Phase C'; $oid = $current_oid . $index; if ($value > 0) { - discover_sensor($valid['sensor'], 'power', $device, $oid, 'ctrl3ChIECRealPowerC', 'geist-pdu', $descr, 1, 1, null, null, null, null, $value); + discover_sensor(null, 'power', $device, $oid, 'ctrl3ChIECRealPowerC', 'geist-pdu', $descr, 1, 1, null, null, null, null, $value); } } diff --git a/includes/discovery/sensors/power/hpblmos.inc.php b/includes/discovery/sensors/power/hpblmos.inc.php index fc2d2ffd08..88cca47d0b 100644 --- a/includes/discovery/sensors/power/hpblmos.inc.php +++ b/includes/discovery/sensors/power/hpblmos.inc.php @@ -19,7 +19,7 @@ foreach (explode("\n", $psus) as $psu) { $descr = 'PSU ' . $current_id . ' output'; $value = snmp_get($device, $current_oid, '-Oqv'); $max_value = snmp_get($device, $psu_max_oid, '-Oqv'); - discover_sensor($valid['sensor'], 'power', $device, $current_oid, $current_id, $sensor_type, $descr, 1, 1, null, null, null, $max_value, $value); + discover_sensor(null, 'power', $device, $current_oid, $current_id, $sensor_type, $descr, 1, 1, null, null, null, $max_value, $value); } } } diff --git a/includes/discovery/sensors/power/netonix.inc.php b/includes/discovery/sensors/power/netonix.inc.php index 8b36b43c53..b3c4e73e5a 100644 --- a/includes/discovery/sensors/power/netonix.inc.php +++ b/includes/discovery/sensors/power/netonix.inc.php @@ -30,5 +30,5 @@ $descr = 'Total Consumption'; $divisor = 10; if (is_numeric($power_value) && $power_value > 0) { - discover_sensor($valid['sensor'], 'power', $device, $power_oid, 0, $device['os'], $descr, $divisor, 1, null, null, null, null, $power_value / $divisor); + discover_sensor(null, 'power', $device, $power_oid, 0, $device['os'], $descr, $divisor, 1, null, null, null, null, $power_value / $divisor); } diff --git a/includes/discovery/sensors/power/powerlogic.inc.php b/includes/discovery/sensors/power/powerlogic.inc.php index 9c76017347..710f7e8041 100644 --- a/includes/discovery/sensors/power/powerlogic.inc.php +++ b/includes/discovery/sensors/power/powerlogic.inc.php @@ -30,7 +30,7 @@ if (is_numeric($data['pReal'][1])) { $descr = 'Power'; $multiplier = 1000; $current = ($data['pReal'][1] * $multiplier); - discover_sensor($valid['sensor'], 'power', $device, $current_oid, $index, 'powerlogic', $descr, 1, $multiplier, null, null, null, null, $current); + discover_sensor(null, 'power', $device, $current_oid, $index, 'powerlogic', $descr, 1, $multiplier, null, null, null, null, $current); } unset($data); diff --git a/includes/discovery/sensors/power/raritan-pdu.inc.php b/includes/discovery/sensors/power/raritan-pdu.inc.php index cd0ad95f27..9385ce571a 100644 --- a/includes/discovery/sensors/power/raritan-pdu.inc.php +++ b/includes/discovery/sensors/power/raritan-pdu.inc.php @@ -18,7 +18,7 @@ if ($inlet_oids) { $inlet_divisor = pow(10, snmp_get($device, "inletSensorDecimalDigits.$inlet_index.activePower", '-Ovq', 'PDU2-MIB')); $inlet_power = (snmp_get($device, "measurementsInletSensorValue.$inlet_index.activePower", '-Ovq', 'PDU2-MIB') / $inlet_divisor); if ($inlet_power >= 0) { - discover_sensor($valid['sensor'], 'power', $device, $inlet_oid, $inlet_index, 'raritan', $inlet_descr, $inlet_divisor, $multiplier, null, null, null, null, $inlet_power); + discover_sensor(null, 'power', $device, $inlet_oid, $inlet_index, 'raritan', $inlet_descr, $inlet_divisor, $multiplier, null, null, null, null, $inlet_power); } } } @@ -41,7 +41,7 @@ if ($outlet_oids) { $outlet_descr = snmp_get($device, "outletLabel.$outletsuffix", '-Ovq', 'PDU-MIB'); $outlet_power = snmp_get($device, "outletApparentPower.$outletsuffix", '-Ovq', 'PDU-MIB'); if ($outlet_power >= 0) { - discover_sensor($valid['sensor'], 'power', $device, $outlet_oid, $outlet_insert_index, 'raritan', $outlet_descr, $divisor, $multiplier, null, null, null, null, $outlet_power); + discover_sensor(null, 'power', $device, $outlet_oid, $outlet_insert_index, 'raritan', $outlet_descr, $divisor, $multiplier, null, null, null, null, $outlet_power); } } } @@ -68,7 +68,7 @@ if ($outlet_oids) { $outlet_divisor = pow(10, snmp_get($device, "outletSensorDecimalDigits.1.$outlet_index.activePower", '-Ovq', 'PDU2-MIB')); $outlet_power = (snmp_get($device, "measurementsOutletSensorValue.1.$outlet_index.activePower", '-Ovq', 'PDU2-MIB') / $outlet_divisor); if ($outlet_power >= 0) { - discover_sensor($valid['sensor'], 'power', $device, $outlet_oid, $outlet_insert_index, 'raritan', $outlet_descr, $outlet_divisor, $multiplier, null, null, null, null, $outlet_power); + discover_sensor(null, 'power', $device, $outlet_oid, $outlet_insert_index, 'raritan', $outlet_descr, $outlet_divisor, $multiplier, null, null, null, null, $outlet_power); } } } diff --git a/includes/discovery/sensors/power/rfc1628.inc.php b/includes/discovery/sensors/power/rfc1628.inc.php index 457ca5fa08..37bc88ea67 100644 --- a/includes/discovery/sensors/power/rfc1628.inc.php +++ b/includes/discovery/sensors/power/rfc1628.inc.php @@ -15,7 +15,7 @@ foreach ($output_power as $index => $data) { } discover_sensor( - $valid['sensor'], + null, 'power', $device, $pwr_oid, @@ -45,7 +45,7 @@ foreach ($input_power as $index => $data) { } discover_sensor( - $valid['sensor'], + null, 'power', $device, $pwr_oid, @@ -75,7 +75,7 @@ foreach ($bypass_power as $index => $data) { } discover_sensor( - $valid['sensor'], + null, 'power', $device, $pwr_oid, diff --git a/includes/discovery/sensors/power/schleifenbauer.inc.php b/includes/discovery/sensors/power/schleifenbauer.inc.php index 074bdbc003..594d915058 100644 --- a/includes/discovery/sensors/power/schleifenbauer.inc.php +++ b/includes/discovery/sensors/power/schleifenbauer.inc.php @@ -12,7 +12,7 @@ foreach ($pre_cache['sdbMgmtCtrlDevUnitAddress'] as $sdbMgmtCtrlDevUnitAddress = // See includes/discovery/entity-physical/schleifenbauer.inc.php for an explanation why we set this as the entPhysicalIndex. $entPhysicalIndex = $sdbMgmtCtrlDevUnitAddress * 1000000 + 100000 + $sdbDevInIndex * 1000 + 130; - discover_sensor($valid['sensor'], 'power', $device, $power_oid, $serial_input, 'schleifenbauer', $descr, '1', '1', null, null, null, null, $sdbDevInPowerVoltAmpere, 'snmp', $entPhysicalIndex); + discover_sensor(null, 'power', $device, $power_oid, $serial_input, 'schleifenbauer', $descr, '1', '1', null, null, null, null, $sdbDevInPowerVoltAmpere, 'snmp', $entPhysicalIndex); } } @@ -26,5 +26,5 @@ foreach ($pre_cache['sdbDevOutMtPowerVoltAmpere'] as $sdbDevOutMtIndex => $sdbDe // See includes/discovery/entity-physical/schleifenbauer.inc.php for an explanation why we set this as the entPhysicalIndex. $entPhysicalIndex = $sdbMgmtCtrlDevUnitAddress * 1000000 + 200000 + $sdbDevOutMtIndex * 1000 + 130; - discover_sensor($valid['sensor'], 'power', $device, $power_oid, $serial_input, 'schleifenbauer', $descr, '1', '1', null, null, null, null, $sdbDevOutMtPowerVoltAmpere, 'snmp', $entPhysicalIndex); + discover_sensor(null, 'power', $device, $power_oid, $serial_input, 'schleifenbauer', $descr, '1', '1', null, null, null, null, $sdbDevOutMtPowerVoltAmpere, 'snmp', $entPhysicalIndex); } diff --git a/includes/discovery/sensors/power/sinetica.inc.php b/includes/discovery/sensors/power/sinetica.inc.php index b6a3158f81..1949d3bf67 100644 --- a/includes/discovery/sensors/power/sinetica.inc.php +++ b/includes/discovery/sensors/power/sinetica.inc.php @@ -37,5 +37,5 @@ foreach ($oids as $oid => $data) { $type = 'sinetica'; $index = '4.4.1.4.' . $current_id; - discover_sensor($valid['sensor'], 'power', $device, $current_oid, $index, $type, $descr, $divisor, 1, null, null, null, null, $current); + discover_sensor(null, 'power', $device, $current_oid, $index, $type, $descr, $divisor, 1, null, null, null, null, $current); } diff --git a/includes/discovery/sensors/power/smartax.inc.php b/includes/discovery/sensors/power/smartax.inc.php index f16549ece7..22f8e07fbb 100644 --- a/includes/discovery/sensors/power/smartax.inc.php +++ b/includes/discovery/sensors/power/smartax.inc.php @@ -27,7 +27,7 @@ $power_frame_oid = '.1.3.6.1.4.1.2011.2.6.7.1.1.1.1.11.0'; $power = snmp_get($device, $power_frame_oid, '-Ovq'); $index = '0'; -discover_sensor($valid['sensor'], 'power', $device, $power_frame_oid, $index, 'smartax-total', 'Chassis Total', '1', '1', null, null, null, null, $power); +discover_sensor(null, 'power', $device, $power_frame_oid, $index, 'smartax-total', 'Chassis Total', '1', '1', null, null, null, null, $power); $power_oid = '1.3.6.1.4.1.2011.2.6.7.1.1.2.1.11.0'; $descr_oid = '1.3.6.1.4.1.2011.2.6.7.1.1.2.1.7.0'; @@ -42,5 +42,5 @@ foreach ($data as $index => $value) { $powerCurr = $value; $pow_oid = '.' . $power_oid . '.' . $index; $descr = $descr_data[$index]; - discover_sensor($valid['sensor'], 'power', $device, $pow_oid, $index, 'smartax', $descr, '1', '1', null, null, null, null, $powerCurr); + discover_sensor(null, 'power', $device, $pow_oid, $index, 'smartax', $descr, '1', '1', null, null, null, null, $powerCurr); } diff --git a/includes/discovery/sensors/power/xos.inc.php b/includes/discovery/sensors/power/xos.inc.php index d368364ae0..8dd0a48b46 100644 --- a/includes/discovery/sensors/power/xos.inc.php +++ b/includes/discovery/sensors/power/xos.inc.php @@ -9,5 +9,5 @@ $divisor = '1000'; if (is_numeric($value)) { $value = ($value / $divisor); // Nasty hack to divide the first value by 1000 since the divisor only works for polling after the sensor has been added - discover_sensor($valid['sensor'], 'power', $device, $oid, '1', 'extreme-power', $descr, $divisor, 1, null, null, null, null, $value); // No limits have been specified since all equipment is different and will use different amount of Watts + discover_sensor(null, 'power', $device, $oid, '1', 'extreme-power', $descr, $divisor, 1, null, null, null, null, $value); // No limits have been specified since all equipment is different and will use different amount of Watts } diff --git a/includes/discovery/sensors/power_consumed/ipoman.inc.php b/includes/discovery/sensors/power_consumed/ipoman.inc.php index 21bafae18f..d1adc82202 100644 --- a/includes/discovery/sensors/power_consumed/ipoman.inc.php +++ b/includes/discovery/sensors/power_consumed/ipoman.inc.php @@ -12,6 +12,6 @@ if (is_array($oids_out)) { $power_consumed_oid = '.1.3.6.1.4.1.2468.1.4.2.1.3.2.3.1.4.' . $index; $divisor = 1000; $descr = (trim($pre_cache['ipoman']['out'][$index]['outletConfigDesc'], '"') != '' ? trim($pre_cache['ipoman']['out'][$index]['outletConfigDesc'], '"') : "Output $index"); - discover_sensor($valid['sensor'], 'power_consumed', $device, $power_consumed_oid, $power_consumed_oid, 'ipoman', $descr, $divisor, 1, 0, null, null, 0); + discover_sensor(null, 'power_consumed', $device, $power_consumed_oid, $power_consumed_oid, 'ipoman', $descr, $divisor, 1, 0, null, null, 0); } } diff --git a/includes/discovery/sensors/power_consumed/schleifenbauer.inc.php b/includes/discovery/sensors/power_consumed/schleifenbauer.inc.php index bb58b318af..d1d64a165b 100644 --- a/includes/discovery/sensors/power_consumed/schleifenbauer.inc.php +++ b/includes/discovery/sensors/power_consumed/schleifenbauer.inc.php @@ -12,7 +12,7 @@ foreach ($pre_cache['sdbMgmtCtrlDevUnitAddress'] ?? [] as $sdbMgmtCtrlDevUnitAdd // See includes/discovery/entity-physical/schleifenbauer.inc.php for an explanation why we set this as the entPhysicalIndex. $entPhysicalIndex = $sdbMgmtCtrlDevUnitAddress * 1000000 + 100000 + $sdbDevInIndex * 1000 + 140; - discover_sensor($valid['sensor'], 'power_consumed', $device, $power_consumed_oid, $serial_input, 'schleifenbauer', $descr, '1', '1', '0', null, null, '16777215', $sdbDevInKWhTotal, 'snmp', $entPhysicalIndex); + discover_sensor(null, 'power_consumed', $device, $power_consumed_oid, $serial_input, 'schleifenbauer', $descr, '1', '1', '0', null, null, '16777215', $sdbDevInKWhTotal, 'snmp', $entPhysicalIndex); } } @@ -26,5 +26,5 @@ foreach ($pre_cache['sdbDevOutMtKWhTotal'] ?? [] as $sdbDevOutMtIndex => $sdbDev // See includes/discovery/entity-physical/schleifenbauer.inc.php for an explanation why we set this as the entPhysicalIndex. $entPhysicalIndex = $sdbMgmtCtrlDevUnitAddress * 1000000 + 200000 + $sdbDevOutMtIndex * 1000 + 140; - discover_sensor($valid['sensor'], 'power_consumed', $device, $power_consumed_oid, $serial_input, 'schleifenbauer', $descr, '1', '1', '0', null, null, '16777215', $sdbDevOutMtKWhTotal, 'snmp', $entPhysicalIndex); + discover_sensor(null, 'power_consumed', $device, $power_consumed_oid, $serial_input, 'schleifenbauer', $descr, '1', '1', '0', null, null, '16777215', $sdbDevOutMtKWhTotal, 'snmp', $entPhysicalIndex); } diff --git a/includes/discovery/sensors/power_factor/schleifenbauer.inc.php b/includes/discovery/sensors/power_factor/schleifenbauer.inc.php index 02198650dc..3115902b62 100644 --- a/includes/discovery/sensors/power_factor/schleifenbauer.inc.php +++ b/includes/discovery/sensors/power_factor/schleifenbauer.inc.php @@ -14,7 +14,7 @@ foreach ($pre_cache['sdbMgmtCtrlDevUnitAddress'] as $sdbMgmtCtrlDevUnitAddress = // See includes/discovery/entity-physical/schleifenbauer.inc.php for an explanation why we set this as the entPhysicalIndex. $entPhysicalIndex = $sdbMgmtCtrlDevUnitAddress * 1000000 + 100000 + $sdbDevInIndex * 1000 + 150; - discover_sensor($valid['sensor'], 'power_factor', $device, $power_factor_oid, $serial_input, 'schleifenbauer', $descr, $divisor, '1', '0', null, null, '1', $power_factor, 'snmp', $entPhysicalIndex); + discover_sensor(null, 'power_factor', $device, $power_factor_oid, $serial_input, 'schleifenbauer', $descr, $divisor, '1', '0', null, null, '1', $power_factor, 'snmp', $entPhysicalIndex); } } @@ -29,5 +29,5 @@ foreach ($pre_cache['sdbDevOutMtPowerFactor'] as $sdbDevOutMtIndex => $sdbDevOut // See includes/discovery/entity-physical/schleifenbauer.inc.php for an explanation why we set this as the entPhysicalIndex. $entPhysicalIndex = $sdbMgmtCtrlDevUnitAddress * 1000000 + 200000 + $sdbDevOutMtIndex * 1000 + 150; - discover_sensor($valid['sensor'], 'power_factor', $device, $power_factor_oid, $serial_input, 'schleifenbauer', $descr, $divisor, '1', '0', null, null, '1', $power_factor, 'snmp', $entPhysicalIndex); + discover_sensor(null, 'power_factor', $device, $power_factor_oid, $serial_input, 'schleifenbauer', $descr, $divisor, '1', '0', null, null, '1', $power_factor, 'snmp', $entPhysicalIndex); } diff --git a/includes/discovery/sensors/rittal-cmc-iii-sensors.inc.php b/includes/discovery/sensors/rittal-cmc-iii-sensors.inc.php index d35bec7d45..f1b693090f 100644 --- a/includes/discovery/sensors/rittal-cmc-iii-sensors.inc.php +++ b/includes/discovery/sensors/rittal-cmc-iii-sensors.inc.php @@ -193,7 +193,7 @@ foreach ($cmc_iii_sensors as $sensor_id => $sensor_data) { $sensor_data['value'] = ($sensor_data['value'] * $sensor_data['multiplier']); } - discover_sensor($valid['sensor'], $sensor_data['type'], $device, $sensor_data['oid'], $sensor_id, $sensor_data['name'], $sensor_data['desc'], $sensor_data['divisor'] ?? 1, $sensor_data['multiplier'] ?? 1, $sensor_data['low_limit'] ?? null, $sensor_data['low_warn_limit'] ?? null, $sensor_data['warn_limit'] ?? null, $sensor_data['high_limit'] ?? null, $sensor_data['value']); + discover_sensor(null, $sensor_data['type'], $device, $sensor_data['oid'], $sensor_id, $sensor_data['name'], $sensor_data['desc'], $sensor_data['divisor'] ?? 1, $sensor_data['multiplier'] ?? 1, $sensor_data['low_limit'] ?? null, $sensor_data['low_warn_limit'] ?? null, $sensor_data['warn_limit'] ?? null, $sensor_data['high_limit'] ?? null, $sensor_data['value']); if (isset($sensor_data['logic'])) { create_sensor_to_state_index($device, $sensor_data['name'], $sensor_id); diff --git a/includes/discovery/sensors/rpigpiomonitor.inc.php b/includes/discovery/sensors/rpigpiomonitor.inc.php index 61f35157e4..ad57a0ce0a 100644 --- a/includes/discovery/sensors/rpigpiomonitor.inc.php +++ b/includes/discovery/sensors/rpigpiomonitor.inc.php @@ -73,7 +73,7 @@ if (! empty($gpio_mon_data)) { create_state_index($sensor_data['name'], $sensor_data['state_data']); } - discover_sensor($valid['sensor'], $sensor_data['type'], $device, $sensor_data['oid'], $sensor_id, $sensor_data['name'], $sensor_data['descr'], 1, 1, $sensor_data['low_limit'], $sensor_data['low_warn_limit'], $sensor_data['warn_limit'], $sensor_data['high_limit'], $sensor_data['value']); + discover_sensor(null, $sensor_data['type'], $device, $sensor_data['oid'], $sensor_id, $sensor_data['name'], $sensor_data['descr'], 1, 1, $sensor_data['low_limit'], $sensor_data['low_warn_limit'], $sensor_data['warn_limit'], $sensor_data['high_limit'], $sensor_data['value']); if (isset($sensor_data['state_data'])) { create_sensor_to_state_index($device, $sensor_data['name'], $sensor_id); diff --git a/includes/discovery/sensors/runtime/apc.inc.php b/includes/discovery/sensors/runtime/apc.inc.php index eedd06b2ca..c09d47d674 100644 --- a/includes/discovery/sensors/runtime/apc.inc.php +++ b/includes/discovery/sensors/runtime/apc.inc.php @@ -13,7 +13,7 @@ if ($oids) { $low_limit_warn = 10; $warn_limit = 2000; $high_limit = 3000; - discover_sensor($valid['sensor'], 'runtime', $device, $oid, $index, $type, $descr, $divisor, '1', $low_limit, $low_limit_warn, $warn_limit, $high_limit, $current); + discover_sensor(null, 'runtime', $device, $oid, $index, $type, $descr, $divisor, '1', $low_limit, $low_limit_warn, $warn_limit, $high_limit, $current); } // InRow IRRP100 @@ -36,7 +36,7 @@ if ($oids) { $descr = 'Filter'; $sensorType = 'apc'; - discover_sensor($valid['sensor'], 'runtime', $device, $cur_oid . $index, 'airIRRP100UnitRunHoursAirFilter.' . $index, $sensorType, $descr, '1', $multiplier, null, null, null, $service_interval, $current); + discover_sensor(null, 'runtime', $device, $cur_oid . $index, 'airIRRP100UnitRunHoursAirFilter.' . $index, $sensorType, $descr, '1', $multiplier, null, null, null, $service_interval, $current); // airIRRP100UnitRunHoursFan1 $index = 0; @@ -49,7 +49,7 @@ if ($oids) { $descr = 'Fan 1'; $sensorType = 'apc'; - discover_sensor($valid['sensor'], 'runtime', $device, $cur_oid . $index, 'airIRRP100UnitRunHoursFan1.' . $index, $sensorType, $descr, '1', $multiplier, null, null, null, $service_interval, $current); + discover_sensor(null, 'runtime', $device, $cur_oid . $index, 'airIRRP100UnitRunHoursFan1.' . $index, $sensorType, $descr, '1', $multiplier, null, null, null, $service_interval, $current); // airIRRP100UnitRunHoursFan2 $index = 0; @@ -62,7 +62,7 @@ if ($oids) { $descr = 'Fan 2'; $sensorType = 'apc'; - discover_sensor($valid['sensor'], 'runtime', $device, $cur_oid . $index, 'airIRRP100UnitRunHoursFan2.' . $index, $sensorType, $descr, '1', $multiplier, null, null, null, $service_interval, $current); + discover_sensor(null, 'runtime', $device, $cur_oid . $index, 'airIRRP100UnitRunHoursFan2.' . $index, $sensorType, $descr, '1', $multiplier, null, null, null, $service_interval, $current); // airIRRP100UnitRunHoursCompressor $index = 0; @@ -75,5 +75,5 @@ if ($oids) { $descr = 'Compressor'; $sensorType = 'apc'; - discover_sensor($valid['sensor'], 'runtime', $device, $cur_oid . $index, 'airIRRP100UnitRunHoursCompressor.' . $index, $sensorType, $descr, '1', $multiplier, null, null, null, $service_interval, $current); + discover_sensor(null, 'runtime', $device, $cur_oid . $index, 'airIRRP100UnitRunHoursCompressor.' . $index, $sensorType, $descr, '1', $multiplier, null, null, null, $service_interval, $current); } diff --git a/includes/discovery/sensors/runtime/compas.inc.php b/includes/discovery/sensors/runtime/compas.inc.php index 7835df1855..561c0b1418 100644 --- a/includes/discovery/sensors/runtime/compas.inc.php +++ b/includes/discovery/sensors/runtime/compas.inc.php @@ -29,5 +29,5 @@ $index = 0; if (is_numeric($batteryAutonomy)) { $sensorType = 'compas'; $descr = 'Runtime'; - discover_sensor($valid['sensor'], 'runtime', $device, $curOID, $index, $sensorType, $descr, '1', '1', null, null, null, null, $batteryAutonomy); + discover_sensor(null, 'runtime', $device, $curOID, $index, $sensorType, $descr, '1', '1', null, null, null, null, $batteryAutonomy); } diff --git a/includes/discovery/sensors/runtime/dell-ups.inc.php b/includes/discovery/sensors/runtime/dell-ups.inc.php index f3cb0de20b..919547cf17 100644 --- a/includes/discovery/sensors/runtime/dell-ups.inc.php +++ b/includes/discovery/sensors/runtime/dell-ups.inc.php @@ -21,5 +21,5 @@ if (is_numeric($temp) && ! is_null($temp)) { $low_limit_warn = 10; $warn_limit = 2000; $high_limit = 3000; - discover_sensor($valid['sensor'], 'runtime', $device, $oid, '0', 'dell-ups', $descr, $divisor, '1', $low_limit, $low_limit_warn, $warn_limit, $high_limit, $current); + discover_sensor(null, 'runtime', $device, $oid, '0', 'dell-ups', $descr, $divisor, '1', $low_limit, $low_limit_warn, $warn_limit, $high_limit, $current); } diff --git a/includes/discovery/sensors/runtime/rfc1628.inc.php b/includes/discovery/sensors/runtime/rfc1628.inc.php index 79df59964e..da64801b71 100644 --- a/includes/discovery/sensors/runtime/rfc1628.inc.php +++ b/includes/discovery/sensors/runtime/rfc1628.inc.php @@ -9,7 +9,7 @@ $secs_on_battery = snmp_get($device, $secs_on_battery_oid, '-Oqv'); if (is_numeric($secs_on_battery)) { $divisor = get_device_divisor($device, $pre_cache['poweralert_serial'] ?? '', 'runtime', $secs_on_battery_oid); discover_sensor( - $valid['sensor'], + null, 'runtime', $device, $secs_on_battery_oid, @@ -33,7 +33,7 @@ $est_battery_time = snmp_get($device, $est_battery_time_oid, '-Ovq'); if (is_numeric($est_battery_time)) { $divisor = get_device_divisor($device, $pre_cache['poweralert_serial'] ?? '', 'runtime', $est_battery_time_oid); discover_sensor( - $valid['sensor'], + null, 'runtime', $device, $est_battery_time_oid, diff --git a/includes/discovery/sensors/runtime/sinetica.inc.php b/includes/discovery/sensors/runtime/sinetica.inc.php index cb7be3e413..abe1845bdc 100644 --- a/includes/discovery/sensors/runtime/sinetica.inc.php +++ b/includes/discovery/sensors/runtime/sinetica.inc.php @@ -31,5 +31,5 @@ if (! empty($runtime)) { $descr = 'Runtime'; $low_limit = 5; $low_limit_warn = 10; - discover_sensor($valid['sensor'], 'runtime', $device, $runtime_oid, $index, $type, $descr, 1, 1, $low_limit, $low_limit_warn, null, null, $runtime); + discover_sensor(null, 'runtime', $device, $runtime_oid, $index, $type, $descr, 1, 1, $low_limit, $low_limit_warn, null, null, $runtime); } diff --git a/includes/discovery/sensors/runtime/unix.inc.php b/includes/discovery/sensors/runtime/unix.inc.php index 5d4fc0aa8b..e7b4b196ef 100644 --- a/includes/discovery/sensors/runtime/unix.inc.php +++ b/includes/discovery/sensors/runtime/unix.inc.php @@ -36,7 +36,7 @@ if (! empty($snmpData)) { if (! empty($value)) { $oid = Oid::toNumeric('NET-SNMP-EXTEND-MIB::nsExtendOutLine."ups-nut".' . $index); discover_sensor( - $valid['sensor'], + null, 'runtime', $device, $oid, diff --git a/includes/discovery/sensors/signal/cambium.inc.php b/includes/discovery/sensors/signal/cambium.inc.php index edcaf0eedc..d9c397aea8 100644 --- a/includes/discovery/sensors/signal/cambium.inc.php +++ b/includes/discovery/sensors/signal/cambium.inc.php @@ -39,5 +39,5 @@ if (! empty($oids)) { $current = $current / $divisor; $index = $oid; $descr = 'Signal'; - discover_sensor($valid['sensor'], 'signal', $device, $oid, $index, $type, $descr, $divisor, '1', null, null, null, null, $current); + discover_sensor(null, 'signal', $device, $oid, $index, $type, $descr, $divisor, '1', null, null, null, null, $current); } diff --git a/includes/discovery/sensors/signal/canopy.inc.php b/includes/discovery/sensors/signal/canopy.inc.php index 039097ebdb..4fcd7c1ada 100644 --- a/includes/discovery/sensors/signal/canopy.inc.php +++ b/includes/discovery/sensors/signal/canopy.inc.php @@ -38,5 +38,5 @@ if (! empty($oids)) { $current = $current / $divisor; $index = $oid; $descr = 'Signal'; - discover_sensor($valid['sensor'], 'signal', $device, $oid, $index, $type, $descr, $divisor, '1', null, null, null, null, $current); + discover_sensor(null, 'signal', $device, $oid, $index, $type, $descr, $divisor, '1', null, null, null, null, $current); } diff --git a/includes/discovery/sensors/snr/arris-c3.inc.php b/includes/discovery/sensors/snr/arris-c3.inc.php index 1a93e0bdf2..bdb548e4f7 100644 --- a/includes/discovery/sensors/snr/arris-c3.inc.php +++ b/includes/discovery/sensors/snr/arris-c3.inc.php @@ -30,7 +30,7 @@ foreach ($pre_cache['ar-c3_docsIfSignalQualityTable'] as $index => $data) { $divisor = 10; $value = $data['docsIfSigQSignalNoise']; if (preg_match('/.0$/', $pre_cache['ar-c3_ifName'][$index]['ifName'])) { - discover_sensor($valid['sensor'], 'snr', $device, $oid, 'docsIfSigQSignalNoise.' . $index, 'arris-c3', $descr, $divisor, '1', null, null, null, null, $value); + discover_sensor(null, 'snr', $device, $oid, 'docsIfSigQSignalNoise.' . $index, 'arris-c3', $descr, $divisor, '1', null, null, null, null, $value); } } } diff --git a/includes/discovery/sensors/snr/arris-c4.inc.php b/includes/discovery/sensors/snr/arris-c4.inc.php index 1eec90369b..ea0a7f9041 100644 --- a/includes/discovery/sensors/snr/arris-c4.inc.php +++ b/includes/discovery/sensors/snr/arris-c4.inc.php @@ -30,7 +30,7 @@ foreach ($pre_cache['ar-c4_docsIfSignalQualityTable'] as $index => $data) { $divisor = 10; $value = $data['docsIfSigQSignalNoise']; if (preg_match('/.0$/', $pre_cache['ar-c4_ifName'][$index]['ifName'])) { - discover_sensor($valid['sensor'], 'snr', $device, $oid, 'docsIfSigQSignalNoise.' . $index, 'cmts', $descr, $divisor, '1', null, null, null, null, $value); + discover_sensor(null, 'snr', $device, $oid, 'docsIfSigQSignalNoise.' . $index, 'cmts', $descr, $divisor, '1', null, null, null, null, $value); } } } diff --git a/includes/discovery/sensors/snr/ciscoepc.inc.php b/includes/discovery/sensors/snr/ciscoepc.inc.php index 70c8cecf0b..ec15fa78c2 100644 --- a/includes/discovery/sensors/snr/ciscoepc.inc.php +++ b/includes/discovery/sensors/snr/ciscoepc.inc.php @@ -28,6 +28,6 @@ foreach ($pre_cache['ciscoepc_docsIfSignalQualityTable'] as $index => $data) { $oid = '.1.3.6.1.2.1.10.127.1.1.4.1.5.' . $index; $divisor = 10; $value = $data['docsIfSigQSignalNoise']; - discover_sensor($valid['sensor'], 'snr', $device, $oid, 'docsIfSigQSignalNoise.' . $index, 'ciscoepc', $descr, $divisor, '1', null, null, null, null, $value); + discover_sensor(null, 'snr', $device, $oid, 'docsIfSigQSignalNoise.' . $index, 'ciscoepc', $descr, $divisor, '1', null, null, null, null, $value); } } diff --git a/includes/discovery/sensors/snr/infinera-groove.inc.php b/includes/discovery/sensors/snr/infinera-groove.inc.php index 6393d34791..cc0481acfc 100644 --- a/includes/discovery/sensors/snr/infinera-groove.inc.php +++ b/includes/discovery/sensors/snr/infinera-groove.inc.php @@ -27,6 +27,6 @@ foreach ($pre_cache['infineragroove_portTable'] as $index => $data) { $descr = $data['portAlias'] . ' Optical SNR'; $oid = '.1.3.6.1.4.1.42229.1.2.4.1.19.1.1.24.' . $index; $value = $data['ochOsOSNR']; - discover_sensor($valid['sensor'], 'snr', $device, $oid, 'ochOsOSNR.' . $index, 'infinera-groove', $descr, null, '1', null, null, null, null, $value); + discover_sensor(null, 'snr', $device, $oid, 'ochOsOSNR.' . $index, 'infinera-groove', $descr, null, '1', null, null, null, null, $value); } } diff --git a/includes/discovery/sensors/snr/terra-sdi480.inc.php b/includes/discovery/sensors/snr/terra-sdi480.inc.php index 5e2d9a5420..9b7df4bfe8 100644 --- a/includes/discovery/sensors/snr/terra-sdi480.inc.php +++ b/includes/discovery/sensors/snr/terra-sdi480.inc.php @@ -40,7 +40,7 @@ if (is_array($pre_cache['sdi480status'])) { $value = $snr / $divisor; $group = 'Inputs'; discover_sensor( - $valid['sensor'], + null, 'snr', $device, $oid, diff --git a/includes/discovery/sensors/state/airos-af-ltu.inc.php b/includes/discovery/sensors/state/airos-af-ltu.inc.php index f9ae32f6d7..f079697f70 100644 --- a/includes/discovery/sensors/state/airos-af-ltu.inc.php +++ b/includes/discovery/sensors/state/airos-af-ltu.inc.php @@ -44,8 +44,8 @@ foreach ($oids as $index => $entry) { create_state_index($rxrate_state_name, $rate_states); //Discover Sensors - discover_sensor($valid['sensor'], 'state', $device, '.1.3.6.1.4.1.41112.1.10.1.4.1.1.' . $index, 1, $txrate_state_name, 'TX Modulation Rate', '1', '1', null, null, null, null, $entry['afLTUStaTxRate']); - discover_sensor($valid['sensor'], 'state', $device, '.1.3.6.1.4.1.41112.1.10.1.4.1.2.' . $index, 2, $rxrate_state_name, 'RX Modulation Rate', '1', '1', null, null, null, null, $entry['afLTUStaRxRate']); + discover_sensor(null, 'state', $device, '.1.3.6.1.4.1.41112.1.10.1.4.1.1.' . $index, 1, $txrate_state_name, 'TX Modulation Rate', '1', '1', null, null, null, null, $entry['afLTUStaTxRate']); + discover_sensor(null, 'state', $device, '.1.3.6.1.4.1.41112.1.10.1.4.1.2.' . $index, 2, $rxrate_state_name, 'RX Modulation Rate', '1', '1', null, null, null, null, $entry['afLTUStaRxRate']); //Create Sensor To State Index create_sensor_to_state_index($device, $txrate_state_name, 1); diff --git a/includes/discovery/sensors/state/airos-af60.inc.php b/includes/discovery/sensors/state/airos-af60.inc.php index 7fb16cbda3..3a9668ccd0 100644 --- a/includes/discovery/sensors/state/airos-af60.inc.php +++ b/includes/discovery/sensors/state/airos-af60.inc.php @@ -24,8 +24,8 @@ foreach ($oids as $index => $entry) { create_state_index($rxmcs_state_name, $rate_states); //Discover Sensors - discover_sensor($valid['sensor'], 'state', $device, '.1.3.6.1.4.1.41112.1.11.1.3.1.5.' . $index, 1, $txmcs_state_name, 'TX MCS Rate', '1', '1', null, null, null, null, $entry['af60StaTxMCS']); - discover_sensor($valid['sensor'], 'state', $device, '.1.3.6.1.4.1.41112.1.11.1.3.1.6.' . $index, 2, $rxmcs_state_name, 'RX MCS Rate', '1', '1', null, null, null, null, $entry['af60StaRxMCS']); + discover_sensor(null, 'state', $device, '.1.3.6.1.4.1.41112.1.11.1.3.1.5.' . $index, 1, $txmcs_state_name, 'TX MCS Rate', '1', '1', null, null, null, null, $entry['af60StaTxMCS']); + discover_sensor(null, 'state', $device, '.1.3.6.1.4.1.41112.1.11.1.3.1.6.' . $index, 2, $rxmcs_state_name, 'RX MCS Rate', '1', '1', null, null, null, null, $entry['af60StaRxMCS']); //Create Sensor To State Index create_sensor_to_state_index($device, $txmcs_state_name, 1); @@ -60,7 +60,7 @@ foreach ($oids as $index => $entry) { create_state_index($activeLink_state_name, $rate_states); //Discover Sensors - discover_sensor($valid['sensor'], 'state', $device, '.1.3.6.1.4.1.41112.1.11.1.3.1.2.' . $index, 1, $activeLink_state_name, 'Active link', '1', '1', null, null, null, null, $entry['af60StaActiveLink']); + discover_sensor(null, 'state', $device, '.1.3.6.1.4.1.41112.1.11.1.3.1.2.' . $index, 1, $activeLink_state_name, 'Active link', '1', '1', null, null, null, null, $entry['af60StaActiveLink']); //Create Sensor To State Index create_sensor_to_state_index($device, $activeLink_state_name, 1); diff --git a/includes/discovery/sensors/state/aos-emu2.inc.php b/includes/discovery/sensors/state/aos-emu2.inc.php index 599c1e3f20..7fdba62994 100644 --- a/includes/discovery/sensors/state/aos-emu2.inc.php +++ b/includes/discovery/sensors/state/aos-emu2.inc.php @@ -49,7 +49,7 @@ foreach ($contacts['emu2_contacts'] as $id => $contact) { create_state_index($state_name, $states); } - discover_sensor($valid['sensor'], 'state', $device, $oid, $index, $state_name, $descr, 1, 1, null, null, null, null, $currentstate, 'snmp', $index); + discover_sensor(null, 'state', $device, $oid, $index, $state_name, $descr, 1, 1, null, null, null, null, $currentstate, 'snmp', $index); create_sensor_to_state_index($device, $state_name, $index); } @@ -79,7 +79,7 @@ foreach ($relays['emu2_relays'] as $id => $relay) { create_state_index($state_name, $states); } - discover_sensor($valid['sensor'], 'state', $device, $oid, $index, $state_name, $descr, 1, 1, null, null, null, null, $currentstate, 'snmp', $index); + discover_sensor(null, 'state', $device, $oid, $index, $state_name, $descr, 1, 1, null, null, null, null, $currentstate, 'snmp', $index); create_sensor_to_state_index($device, $state_name, $index); } @@ -109,6 +109,6 @@ foreach ($outlets['emu2_outlets'] as $id => $outlet) { create_state_index($state_name, $states); } - discover_sensor($valid['sensor'], 'state', $device, $oid, $index, $state_name, $descr, 1, 1, null, null, null, null, $currentstate, 'snmp', $index); + discover_sensor(null, 'state', $device, $oid, $index, $state_name, $descr, 1, 1, null, null, null, null, $currentstate, 'snmp', $index); create_sensor_to_state_index($device, $state_name, $index); } diff --git a/includes/discovery/sensors/state/aos6.inc.php b/includes/discovery/sensors/state/aos6.inc.php index 5a8aabfb91..17cd1abf46 100644 --- a/includes/discovery/sensors/state/aos6.inc.php +++ b/includes/discovery/sensors/state/aos6.inc.php @@ -25,7 +25,7 @@ foreach ($aos6_fan_oids as $index => $data) { ]; if (! empty($current)) { create_state_index($state_name, $states); - discover_sensor($valid['sensor'], 'state', $device, $oid, $index, $state_name, $descr, 1, 1, null, null, null, null, $current); + discover_sensor(null, 'state', $device, $oid, $index, $state_name, $descr, 1, 1, null, null, null, null, $current); create_sensor_to_state_index($device, $state_name, $index); } } @@ -50,7 +50,7 @@ if (($stack_left < $stacking) && ($stack_alone < $stacking_non)) { ['value' => 2, 'generic' => 2, 'graph' => 1, 'descr' => 'Disconnected'], ]; create_state_index($stack_state_namea, $states_stacka); - discover_sensor($valid['sensor'], 'state', $device, $oid_stackport_a, $stackindexa, $stack_state_namea, $descr_stacka, 1, 1, null, null, null, null, $current_stacka); + discover_sensor(null, 'state', $device, $oid_stackport_a, $stackindexa, $stack_state_namea, $descr_stacka, 1, 1, null, null, null, null, $current_stacka); create_sensor_to_state_index($device, $stack_state_namea, $stackindexa); } } @@ -68,7 +68,7 @@ if (($stack_left < $stacking) && ($stack_alone < $stacking_non)) { ['value' => 2, 'generic' => 2, 'graph' => 1, 'descr' => 'Disconnected'], ]; create_state_index($stack_state_nameb, $states_stackb); - discover_sensor($valid['sensor'], 'state', $device, $oid_stackport_b, $stackindexb, $stack_state_nameb, $descr_stackb, 1, 1, null, null, null, null, $current_stackb); + discover_sensor(null, 'state', $device, $oid_stackport_b, $stackindexb, $stack_state_nameb, $descr_stackb, 1, 1, null, null, null, null, $current_stackb); create_sensor_to_state_index($device, $stack_state_nameb, $stackindexb); } } diff --git a/includes/discovery/sensors/state/apc.inc.php b/includes/discovery/sensors/state/apc.inc.php index 9018edb2f1..0d1cea64ce 100644 --- a/includes/discovery/sensors/state/apc.inc.php +++ b/includes/discovery/sensors/state/apc.inc.php @@ -25,7 +25,7 @@ if (is_numeric($temp)) { $descr = 'UPS Battery Replacement Status'; //Discover Sensors - discover_sensor($valid['sensor'], 'state', $device, $cur_oid, $index, $state_name, $descr, 1, 1, null, null, null, null, $temp, 'snmp', $index); + discover_sensor(null, 'state', $device, $cur_oid, $index, $state_name, $descr, 1, 1, null, null, null, null, $temp, 'snmp', $index); //Create Sensor To State Index create_sensor_to_state_index($device, $state_name, $index); @@ -45,7 +45,7 @@ foreach ($cooling_status as $index => $data) { } create_state_index($state_name, $states); - discover_sensor($valid['sensor'], 'state', $device, $cur_oid, $cur_oid, 'apc', $state_name, 1, 1, null, null, null, null, $data['coolingUnitStatusDiscreteValueAsInteger']); + discover_sensor(null, 'state', $device, $cur_oid, $cur_oid, 'apc', $state_name, 1, 1, null, null, null, null, $data['coolingUnitStatusDiscreteValueAsInteger']); create_sensor_to_state_index($device, $state_name, $index); } @@ -65,7 +65,7 @@ foreach ($cooling_unit as $index => $data) { } create_state_index($state_name, $states); - discover_sensor($valid['sensor'], 'state', $device, $cur_oid, $cur_oid, 'apc', $state_name, 1, 1, null, null, null, null, $data['coolingUnitExtendedDiscreteValueAsInteger']); + discover_sensor(null, 'state', $device, $cur_oid, $cur_oid, 'apc', $state_name, 1, 1, null, null, null, null, $data['coolingUnitExtendedDiscreteValueAsInteger']); create_sensor_to_state_index($device, $state_name, $index); } @@ -83,7 +83,7 @@ foreach ($relays as $index => $data) { $current = apc_relay_state($data['emsOutputRelayControlOutputRelayCommand']); if (is_numeric($current)) { - discover_sensor($valid['sensor'], 'state', $device, $cur_oid, $cur_oid, $state_name, $state_name, 1, 1, null, null, null, null, $current); + discover_sensor(null, 'state', $device, $cur_oid, $cur_oid, $state_name, $state_name, 1, 1, null, null, null, null, $current); create_sensor_to_state_index($device, $state_name, $cur_oid); } } @@ -105,7 +105,7 @@ foreach ($switched as $index => $data) { $current = apc_relay_state($data['emsOutletControlOutletCommand']); if (is_numeric($current)) { - discover_sensor($valid['sensor'], 'state', $device, $cur_oid, $cur_oid, $state_name, $state_name, 1, 1, null, null, null, null, $current); + discover_sensor(null, 'state', $device, $cur_oid, $cur_oid, $state_name, $state_name, 1, 1, null, null, null, null, $current); create_sensor_to_state_index($device, $state_name, $cur_oid); } } @@ -132,7 +132,7 @@ foreach ($pre_cache['mem_sensors_status'] as $index => $data) { $divisor = 1; $multiplier = 1; if (is_numeric($current)) { - discover_sensor($valid['sensor'], 'state', $device, $cur_oid, $state_name . '.' . $index, $state_name, $state_name, 1, 1, null, null, null, null, $current); + discover_sensor(null, 'state', $device, $cur_oid, $state_name . '.' . $index, $state_name, $state_name, 1, 1, null, null, null, null, $current); create_sensor_to_state_index($device, $state_name, $state_name . '.' . $index); } @@ -152,7 +152,7 @@ foreach ($pre_cache['mem_sensors_status'] as $index => $data) { $divisor = 1; $multiplier = 1; if (is_numeric($current)) { - discover_sensor($valid['sensor'], 'state', $device, $cur_oid, $state_name . '.' . $index, $state_name, $state_name, 1, 1, null, null, null, null, $current); + discover_sensor(null, 'state', $device, $cur_oid, $state_name . '.' . $index, $state_name, $state_name, 1, 1, null, null, null, null, $current); create_sensor_to_state_index($device, $state_name, $state_name . '.' . $index); } } @@ -191,7 +191,7 @@ if ($apcContactData['uioInputContactStatusTableSize'] > 0) { $index = $split_index[0]; } - discover_sensor($valid['sensor'], 'state', $device, $cur_oid, $state_name . '.' . $index, $state_name, $state_name, 1, 1, null, null, null, null, $current); + discover_sensor(null, 'state', $device, $cur_oid, $state_name . '.' . $index, $state_name, $state_name, 1, 1, null, null, null, null, $current); create_sensor_to_state_index($device, $state_name, $state_name . '.' . $index); } } @@ -225,7 +225,7 @@ if ($apcContactData['uioInputContactStatusTableSize'] > 0) { ]; create_state_index($state_name, $states); - discover_sensor($valid['sensor'], 'state', $device, $cur_oid, $state_name . '.' . $index, $state_name, $state_name, 1, 1, null, null, null, null, $current); + discover_sensor(null, 'state', $device, $cur_oid, $state_name . '.' . $index, $state_name, $state_name, 1, 1, null, null, null, null, $current); create_sensor_to_state_index($device, $state_name, $state_name . '.' . $index); } } diff --git a/includes/discovery/sensors/state/arubaos-cx.inc.php b/includes/discovery/sensors/state/arubaos-cx.inc.php index b6a6e3b0fd..bce0a1e298 100644 --- a/includes/discovery/sensors/state/arubaos-cx.inc.php +++ b/includes/discovery/sensors/state/arubaos-cx.inc.php @@ -54,7 +54,7 @@ if (is_array($temp)) { foreach ($temp as $index => $data) { $descr = 'VSF Status'; $oid = '.1.3.6.1.4.1.47196.4.1.1.3.15.1.1.1.' . $index; - discover_sensor($valid['sensor'], 'state', $device, $oid, $index, $state_name, $descr, 1, 1, null, null, null, null, null, 'snmp', null, null, null, 'VSF'); + discover_sensor(null, 'state', $device, $oid, $index, $state_name, $descr, 1, 1, null, null, null, null, null, 'snmp', null, null, null, 'VSF'); //Create Sensor To State Index create_sensor_to_state_index($device, $state_name, $index); @@ -71,7 +71,7 @@ if (is_array($temp)) { foreach ($temp as $index => $data) { $descr = 'Member ' . $data['arubaWiredVsfv2MemberSerialNum'] . ' Status'; $oid = '.1.3.6.1.4.1.47196.4.1.1.3.15.1.2.1.3.' . $index; - discover_sensor($valid['sensor'], 'state', $device, $oid, $index, $state_name, $descr, 1, 1, null, null, null, null, null, 'snmp', null, null, null, 'VSF'); + discover_sensor(null, 'state', $device, $oid, $index, $state_name, $descr, 1, 1, null, null, null, null, null, 'snmp', null, null, null, 'VSF'); //Create Sensor To State Index create_sensor_to_state_index($device, $state_name, $index); diff --git a/includes/discovery/sensors/state/asa.inc.php b/includes/discovery/sensors/state/asa.inc.php index 7e24a083a7..4b7811f18e 100644 --- a/includes/discovery/sensors/state/asa.inc.php +++ b/includes/discovery/sensors/state/asa.inc.php @@ -41,7 +41,7 @@ if (is_array($temp)) { $index = 7; } //Discover Sensors - discover_sensor($valid['sensor'], 'state', $device, $cur_oid . $index, $index, $state_name, $descr, 1, 1, null, null, null, null, $temp[$index][' cfwHardwareStatusValue'], 'snmp', $index); + discover_sensor(null, 'state', $device, $cur_oid . $index, $index, $state_name, $descr, 1, 1, null, null, null, null, $temp[$index][' cfwHardwareStatusValue'], 'snmp', $index); //Create Sensor To State Index create_sensor_to_state_index($device, $state_name, $index); diff --git a/includes/discovery/sensors/state/axiscam.inc.php b/includes/discovery/sensors/state/axiscam.inc.php index d8fab85dc8..78b95ebb7d 100644 --- a/includes/discovery/sensors/state/axiscam.inc.php +++ b/includes/discovery/sensors/state/axiscam.inc.php @@ -23,7 +23,7 @@ if (is_array($oids)) { foreach ($oids as $index => $entry) { //Discover Sensors - discover_sensor($valid['sensor'], 'state', $device, $cur_oid . $index, $index, $state_name, 'Temperature Sensor ' . $index, 1, 1, null, null, null, null, $entry['tempSensorStatus'], 'snmp', $index); + discover_sensor(null, 'state', $device, $cur_oid . $index, $index, $state_name, 'Temperature Sensor ' . $index, 1, 1, null, null, null, null, $entry['tempSensorStatus'], 'snmp', $index); //Create Sensor To State Index create_sensor_to_state_index($device, $state_name, $index); @@ -45,7 +45,7 @@ if (is_array($oids)) { foreach ($oids as $index => $entry) { //Discover Sensors - discover_sensor($valid['sensor'], 'state', $device, $cur_oid . $index, $index, $state_name, 'Storage Status: ' . $entry['storageName'], 1, 1, null, null, null, null, $entry['storageDisruptionDetected'], 'snmp', $index); + discover_sensor(null, 'state', $device, $cur_oid . $index, $index, $state_name, 'Storage Status: ' . $entry['storageName'], 1, 1, null, null, null, null, $entry['storageDisruptionDetected'], 'snmp', $index); //Create Sensor To State Index create_sensor_to_state_index($device, $state_name, $index); diff --git a/includes/discovery/sensors/state/boss.inc.php b/includes/discovery/sensors/state/boss.inc.php index f99d2bb03a..c30ae21d42 100644 --- a/includes/discovery/sensors/state/boss.inc.php +++ b/includes/discovery/sensors/state/boss.inc.php @@ -52,7 +52,7 @@ if ($device['os'] === 'boss') { $descr = "BOSS Unit $unit: $entry[s5ChasComDescr]"; } //Discover Sensors - discover_sensor($valid['sensor'], 'state', $device, $cur_oid . $index, "s5ChasComOperState.$index", $state_name, $descr, 1, 1, null, null, null, null, $entry['s5ChasComOperState']); + discover_sensor(null, 'state', $device, $cur_oid . $index, "s5ChasComOperState.$index", $state_name, $descr, 1, 1, null, null, null, null, $entry['s5ChasComOperState']); //Create Sensor To State Index create_sensor_to_state_index($device, $state_name, "s5ChasComOperState.$index"); $temp_unit = $unit; diff --git a/includes/discovery/sensors/state/cisco.inc.php b/includes/discovery/sensors/state/cisco.inc.php index fc7322f28b..434d2052ca 100644 --- a/includes/discovery/sensors/state/cisco.inc.php +++ b/includes/discovery/sensors/state/cisco.inc.php @@ -225,7 +225,7 @@ foreach ($tables as $tablevalue) { $repsegmentnumber++; $descr = $tablevalue['descr'] . $repsegmentnumber; } - discover_sensor($valid['sensor'], 'state', $device, $cur_oid . $index, $index, $state_name, trim($descr), 1, 1, null, null, null, null, $temp[$index][$tablevalue['state_name']], 'snmp', $index, null, null, $state_group); + discover_sensor(null, 'state', $device, $cur_oid . $index, $index, $state_name, trim($descr), 1, 1, null, null, null, null, $temp[$index][$tablevalue['state_name']], 'snmp', $index, null, null, $state_group); //Create Sensor To State Index create_sensor_to_state_index($device, $state_name, $index); diff --git a/includes/discovery/sensors/state/ciscosb.inc.php b/includes/discovery/sensors/state/ciscosb.inc.php index 729fa0b608..e93db4dff0 100644 --- a/includes/discovery/sensors/state/ciscosb.inc.php +++ b/includes/discovery/sensors/state/ciscosb.inc.php @@ -29,7 +29,7 @@ if (is_array($temp)) { $descr = trim(($port_data['ifDescr'] ?? '') . ' Suspended Status'); if (Str::contains($descr, ['ethernet', 'Ethernet']) && $port_data['ifOperStatus'] !== 'notPresent') { //Discover Sensors - discover_sensor($valid['sensor'], 'state', $device, $cur_oid . $index, $index, $state_name, $descr, 1, 1, null, null, null, null, $temp[$index]['swIfOperSuspendedStatus'], 'snmp', $index); + discover_sensor(null, 'state', $device, $cur_oid . $index, $index, $state_name, $descr, 1, 1, null, null, null, null, $temp[$index]['swIfOperSuspendedStatus'], 'snmp', $index); //Create Sensor To State Index create_sensor_to_state_index($device, $state_name, $index); diff --git a/includes/discovery/sensors/state/commander-plus.inc.php b/includes/discovery/sensors/state/commander-plus.inc.php index eebda77a74..ced8fd26f8 100644 --- a/includes/discovery/sensors/state/commander-plus.inc.php +++ b/includes/discovery/sensors/state/commander-plus.inc.php @@ -34,7 +34,7 @@ foreach ($state_table[0] as $state_name => $state_value) { create_state_index($state_name, $states); $descr = $state_name; - discover_sensor($valid['sensor'], 'state', $device, $start_oid . '.' . $x . '.0', $state_name, $state_name, $descr, 1, 1, null, null, null, null, $state_value, 'snmp'); + discover_sensor(null, 'state', $device, $start_oid . '.' . $x . '.0', $state_name, $state_name, $descr, 1, 1, null, null, null, null, $state_value, 'snmp'); //Create Sensor To State Index create_sensor_to_state_index($device, $state_name, $state_name); diff --git a/includes/discovery/sensors/state/compas.inc.php b/includes/discovery/sensors/state/compas.inc.php index 92158c1922..a42a021415 100644 --- a/includes/discovery/sensors/state/compas.inc.php +++ b/includes/discovery/sensors/state/compas.inc.php @@ -44,7 +44,7 @@ if (is_numeric($batteryTestState)) { $descr = 'Battery Test Status'; //Discover Sensors - discover_sensor($valid['sensor'], 'state', $device, $curOID, $index, $state_name, $descr, '1', '1', null, null, null, null, $batteryTestState); + discover_sensor(null, 'state', $device, $curOID, $index, $state_name, $descr, '1', '1', null, null, null, null, $batteryTestState); //Create Sensor To State Index create_sensor_to_state_index($device, $state_name, $index); } @@ -65,7 +65,7 @@ if (is_numeric($dcMode)) { $descr = 'System DC Mode'; //Discover Sensors - discover_sensor($valid['sensor'], 'state', $device, $curOID, $index, $state_name, $descr, '1', '1', null, null, null, null, $dcMode); + discover_sensor(null, 'state', $device, $curOID, $index, $state_name, $descr, '1', '1', null, null, null, null, $dcMode); //Create Sensor To State Index create_sensor_to_state_index($device, $state_name, $index); } diff --git a/includes/discovery/sensors/state/ctm.inc.php b/includes/discovery/sensors/state/ctm.inc.php index bfa81a5eb4..122744a02a 100644 --- a/includes/discovery/sensors/state/ctm.inc.php +++ b/includes/discovery/sensors/state/ctm.inc.php @@ -73,7 +73,7 @@ foreach ($octetSetup as $entry) { foreach ($onStates as $index => $value) { $port_number = $index + 1; discover_sensor( - $valid['sensor'], + null, 'state', $device, $entry['num_oid'], diff --git a/includes/discovery/sensors/state/dell.inc.php b/includes/discovery/sensors/state/dell.inc.php index d5742fad46..1bdf0b6fbd 100644 --- a/includes/discovery/sensors/state/dell.inc.php +++ b/includes/discovery/sensors/state/dell.inc.php @@ -117,7 +117,7 @@ foreach ($tables as [$table, $num_oid, $value_oid, $descr_oid, $mib, $mib_dir]) $descr = strip_tags($entry[$descr_oid]); // Use clean as virtualDiskDeviceName is user defined } //Discover Sensors - discover_sensor($valid['sensor'], 'state', $device, $num_oid . $index, $index, $state_name, $descr, 1, 1, null, null, null, null, $entry[$value_oid], 'snmp', $index); + discover_sensor(null, 'state', $device, $num_oid . $index, $index, $state_name, $descr, 1, 1, null, null, null, null, $entry[$value_oid], 'snmp', $index); //Create Sensor To State Index create_sensor_to_state_index($device, $state_name, $index); diff --git a/includes/discovery/sensors/state/dhcpatriot.inc.php b/includes/discovery/sensors/state/dhcpatriot.inc.php index 624ea9f1f5..3912d01891 100644 --- a/includes/discovery/sensors/state/dhcpatriot.inc.php +++ b/includes/discovery/sensors/state/dhcpatriot.inc.php @@ -96,7 +96,7 @@ foreach ($oids as $index => $entry) { if (! empty($current)) { discover_sensor( - $valid['sensor'], + null, $class, $device, $oid, diff --git a/includes/discovery/sensors/state/drac.inc.php b/includes/discovery/sensors/state/drac.inc.php index a15798ed2a..a8bf6ca5af 100644 --- a/includes/discovery/sensors/state/drac.inc.php +++ b/includes/discovery/sensors/state/drac.inc.php @@ -82,7 +82,7 @@ foreach ($tables as [$table_oid, $num_oid, $value_oid, $descr_oid]) { $descr = $entry[$descr_oid]; } discover_sensor( - $valid['sensor'], + null, 'state', $device, $num_oid . $index, diff --git a/includes/discovery/sensors/state/eltek-webpower.inc.php b/includes/discovery/sensors/state/eltek-webpower.inc.php index c7c3a771ba..2453338f3a 100644 --- a/includes/discovery/sensors/state/eltek-webpower.inc.php +++ b/includes/discovery/sensors/state/eltek-webpower.inc.php @@ -70,7 +70,7 @@ foreach ($count as &$countValue) { $num_oid = $symmetry_oid[$countValue - 1]; $state = $state_numeric / $divisor; $descr = 'Battery banks symmetry ' . $countValue; - discover_sensor($valid['sensor'], 'state', $device, $num_oid, $index, $state_name, $descr, $divisor, '1', null, null, null, $limit, $state); + discover_sensor(null, 'state', $device, $num_oid, $index, $state_name, $descr, $divisor, '1', null, null, null, $limit, $state); create_sensor_to_state_index($device, $state_name, $index); } } diff --git a/includes/discovery/sensors/state/enlogic-pdu.inc.php b/includes/discovery/sensors/state/enlogic-pdu.inc.php index 64445dd1bc..20c2ccce6d 100644 --- a/includes/discovery/sensors/state/enlogic-pdu.inc.php +++ b/includes/discovery/sensors/state/enlogic-pdu.inc.php @@ -40,7 +40,7 @@ foreach ($pre_cache['enlogic_pdu_status'] as $index => $data) { $descr = "Load state #$index"; //Discover Sensors - discover_sensor($valid['sensor'], 'state', $device, $oid, $index, $state_name, $descr, 1, 1, null, null, null, null, $current); + discover_sensor(null, 'state', $device, $oid, $index, $state_name, $descr, 1, 1, null, null, null, null, $current); //Create Sensor To State Index create_sensor_to_state_index($device, $state_name, $index); } @@ -64,7 +64,7 @@ foreach ($pre_cache['enlogic_pdu_input'] as $index => $data) { create_state_index($state_name, $states); //Discover Sensors - discover_sensor($valid['sensor'], 'state', $device, $oid, $tmp_index, $state_name, $descr, 1, 1, null, null, null, null, $current); + discover_sensor(null, 'state', $device, $oid, $tmp_index, $state_name, $descr, 1, 1, null, null, null, null, $current); //Create Sensor To State Index create_sensor_to_state_index($device, $state_name, $tmp_index); } @@ -85,7 +85,7 @@ foreach ($pre_cache['enlogic_pdu_input'] as $index => $data) { create_state_index($state_name, $states); //Discover Sensors - discover_sensor($valid['sensor'], 'state', $device, $oid, $tmp_index, $state_name, $descr, 1, 1, null, null, null, null, $current); + discover_sensor(null, 'state', $device, $oid, $tmp_index, $state_name, $descr, 1, 1, null, null, null, null, $current); //Create Sensor To State Index create_sensor_to_state_index($device, $state_name, $tmp_index); } @@ -111,7 +111,7 @@ foreach ($pre_cache['enlogic_pdu_circuit'] as $index => $data) { $descr = "Circuit breaker state {$data['pduCircuitBreakerLabel']}"; //Discover Sensors - discover_sensor($valid['sensor'], 'state', $device, $oid, $index, $state_name, $descr, 1, 1, null, null, null, null, $current); + discover_sensor(null, 'state', $device, $oid, $index, $state_name, $descr, 1, 1, null, null, null, null, $current); //Create Sensor To State Index create_sensor_to_state_index($device, $state_name, $index); } diff --git a/includes/discovery/sensors/state/equallogic.inc.php b/includes/discovery/sensors/state/equallogic.inc.php index 76994034f4..cfc025925f 100644 --- a/includes/discovery/sensors/state/equallogic.inc.php +++ b/includes/discovery/sensors/state/equallogic.inc.php @@ -57,7 +57,7 @@ if (! empty($oids)) { $index = (int) cast_number($num_index); $low_limit = 0.5; $high_limit = 2.5; - discover_sensor($valid['sensor'], 'state', $device, $oid, $index, $state_name, $descr, 1, 1, $low_limit, $low_limit, $high_limit, $high_limit, $current, 'snmp', $index); + discover_sensor(null, 'state', $device, $oid, $index, $state_name, $descr, 1, 1, $low_limit, $low_limit, $high_limit, $high_limit, $current, 'snmp', $index); create_sensor_to_state_index($device, $state_name, $index); } } @@ -109,7 +109,7 @@ if (! empty($oids1)) { $index = (100 + $index); $low_limit = 0.5; $high_limit = 1.5; - discover_sensor($valid['sensor'], 'state', $device, $oid, $index, $state_name, $descr, 1, 1, $low_limit, $low_limit, $high_limit, $high_limit, $pstatus, 'snmp', $index); + discover_sensor(null, 'state', $device, $oid, $index, $state_name, $descr, 1, 1, $low_limit, $low_limit, $high_limit, $high_limit, $pstatus, 'snmp', $index); create_sensor_to_state_index($device, $state_name, $index); } }//end if @@ -153,7 +153,7 @@ if (! empty($oids_disks)) { $index = 'eqlDiskStatus.' . $disk_index; $low_limit = 0.5; $high_limit = 1.5; - discover_sensor($valid['sensor'], 'state', $device, $oid, $index, $state_name, "Disk $disk_index - $descr", 1, 1, $low_limit, $low_limit, $high_limit, $high_limit, $pstatus, 'snmp', $index); + discover_sensor(null, 'state', $device, $oid, $index, $state_name, "Disk $disk_index - $descr", 1, 1, $low_limit, $low_limit, $high_limit, $high_limit, $pstatus, 'snmp', $index); create_sensor_to_state_index($device, $state_name, $index); unset( $index, diff --git a/includes/discovery/sensors/state/eurostor.inc.php b/includes/discovery/sensors/state/eurostor.inc.php index 3eee0f192f..d7417145c9 100644 --- a/includes/discovery/sensors/state/eurostor.inc.php +++ b/includes/discovery/sensors/state/eurostor.inc.php @@ -39,7 +39,7 @@ foreach ($walk as $mib => $num_oid) { break; } } - discover_sensor($valid['sensor'], 'state', $device, $num_oid . $index, $mib . $index, $state_name, $entry[$mib . 'Desc'], 1, 1, null, null, null, null, $stateLookupTable[$entry[$mib . 'State']], 'snmp', $mib . $index, null, null, $group); + discover_sensor(null, 'state', $device, $num_oid . $index, $mib . $index, $state_name, $entry[$mib . 'Desc'], 1, 1, null, null, null, null, $stateLookupTable[$entry[$mib . 'State']], 'snmp', $mib . $index, null, null, $group); create_sensor_to_state_index($device, $state_name, $mib . $index); } } diff --git a/includes/discovery/sensors/state/extendair.inc.php b/includes/discovery/sensors/state/extendair.inc.php index 4e7cded1f1..44da88c7b6 100644 --- a/includes/discovery/sensors/state/extendair.inc.php +++ b/includes/discovery/sensors/state/extendair.inc.php @@ -56,7 +56,7 @@ foreach ($sensors as $sensor) { create_state_index($state_name, $states); $descr = $sensor['descr']; - discover_sensor($valid['sensor'], 'state', $device, $cur_oid, $index, $state_name, $descr, 1, 1, null, null, null, null, $temp); + discover_sensor(null, 'state', $device, $cur_oid, $index, $state_name, $descr, 1, 1, null, null, null, null, $temp); create_sensor_to_state_index($device, $state_name, $index); } } diff --git a/includes/discovery/sensors/state/fortigate.inc.php b/includes/discovery/sensors/state/fortigate.inc.php index 197ff31865..e7332ace31 100644 --- a/includes/discovery/sensors/state/fortigate.inc.php +++ b/includes/discovery/sensors/state/fortigate.inc.php @@ -78,7 +78,7 @@ if ($systemMode == 'activePassive' || $systemMode == 'activeActive') { // Setup a sensor for the cluster sync state discover_sensor( - $valid['sensor'], + null, 'state', $device, $fgHaStatsSyncStatus_num . '.' . $index, diff --git a/includes/discovery/sensors/state/fs-nmu.inc.php b/includes/discovery/sensors/state/fs-nmu.inc.php index 61c13c9926..1abe4512a1 100644 --- a/includes/discovery/sensors/state/fs-nmu.inc.php +++ b/includes/discovery/sensors/state/fs-nmu.inc.php @@ -40,7 +40,7 @@ if (is_numeric($power1)) { create_state_index($state_name, $states); $descr = 'Power 1 State'; - discover_sensor($valid['sensor'], 'state', $device, $oid_power1, $index, $state_name, $descr, 1, 1, null, null, null, null, $power1, 'snmp', $index); + discover_sensor(null, 'state', $device, $oid_power1, $index, $state_name, $descr, 1, 1, null, null, null, null, $power1, 'snmp', $index); create_sensor_to_state_index($device, $state_name, $index); } @@ -55,7 +55,7 @@ if (is_numeric($power2)) { create_state_index($state_name, $states); $descr = 'Power 2 State'; - discover_sensor($valid['sensor'], 'state', $device, $oid_power2, $index, $state_name, $descr, 1, 1, null, null, null, null, $power2, 'snmp', $index); + discover_sensor(null, 'state', $device, $oid_power2, $index, $state_name, $descr, 1, 1, null, null, null, null, $power2, 'snmp', $index); create_sensor_to_state_index($device, $state_name, $index); } @@ -70,7 +70,7 @@ if (is_numeric($fan)) { create_state_index($state_name, $states); $descr = 'Fan State'; - discover_sensor($valid['sensor'], 'state', $device, $oid_fan, $index, $state_name, $descr, 1, 1, null, null, null, null, $fan, 'snmp', $index); + discover_sensor(null, 'state', $device, $oid_fan, $index, $state_name, $descr, 1, 1, null, null, null, null, $fan, 'snmp', $index); create_sensor_to_state_index($device, $state_name, $index); } diff --git a/includes/discovery/sensors/state/hirschmann.inc.php b/includes/discovery/sensors/state/hirschmann.inc.php index 09f3cdd944..6b7200af94 100644 --- a/includes/discovery/sensors/state/hirschmann.inc.php +++ b/includes/discovery/sensors/state/hirschmann.inc.php @@ -20,7 +20,7 @@ if ($device['os'] == 'hirschmann') { foreach ($oid as $index => $entry) { //Discover Sensors - discover_sensor($valid['sensor'], 'state', $device, $cur_oid . $index, 'hmPowerSupplyStatus' . $index, $state_name, 'Power Supply ' . (isset($entry['hmPSID']) ? $entry['hmPSID'] : $index), 1, 1, null, null, null, null, $entry['hmPowerSupplyStatus'] ?? null, 'snmp'); + discover_sensor(null, 'state', $device, $cur_oid . $index, 'hmPowerSupplyStatus' . $index, $state_name, 'Power Supply ' . (isset($entry['hmPSID']) ? $entry['hmPSID'] : $index), 1, 1, null, null, null, null, $entry['hmPowerSupplyStatus'] ?? null, 'snmp'); //Create Sensor To State Index create_sensor_to_state_index($device, $state_name, 'hmPowerSupplyStatus' . $index); @@ -51,7 +51,7 @@ if ($device['os'] == 'hirschmann') { $descr = 'LED Status Power Supply'; //Discover Sensors - discover_sensor($valid['sensor'], 'state', $device, $cur_oid, 'hmLEDRSPowerSupply.' . $index, $state_name, $descr, 1, 1, null, null, null, null, $temp, 'snmp'); + discover_sensor(null, 'state', $device, $cur_oid, 'hmLEDRSPowerSupply.' . $index, $state_name, $descr, 1, 1, null, null, null, null, $temp, 'snmp'); //Create Sensor To State Index create_sensor_to_state_index($device, $state_name, 'hmLEDRSPowerSupply.' . $index); @@ -71,7 +71,7 @@ if ($device['os'] == 'hirschmann') { $descr = 'LED Status Standby'; //Discover Sensors - discover_sensor($valid['sensor'], 'state', $device, $cur_oid, 'hmLEDRStandby.' . $index, $state_name, $descr, 1, 1, null, null, null, null, $temp, 'snmp'); + discover_sensor(null, 'state', $device, $cur_oid, 'hmLEDRStandby.' . $index, $state_name, $descr, 1, 1, null, null, null, null, $temp, 'snmp'); //Create Sensor To State Index create_sensor_to_state_index($device, $state_name, 'hmLEDRStandby.' . $index); @@ -91,7 +91,7 @@ if ($device['os'] == 'hirschmann') { $descr = 'LED Status Redundancy Manager'; //Discover Sensors - discover_sensor($valid['sensor'], 'state', $device, $cur_oid, 'hmLEDRSRedundancyManager.' . $index, $state_name, $descr, 1, 1, null, null, null, null, $temp, 'snmp'); + discover_sensor(null, 'state', $device, $cur_oid, 'hmLEDRSRedundancyManager.' . $index, $state_name, $descr, 1, 1, null, null, null, null, $temp, 'snmp'); //Create Sensor To State Index create_sensor_to_state_index($device, $state_name, 'hmLEDRSRedundancyManager.' . $index); @@ -111,7 +111,7 @@ if ($device['os'] == 'hirschmann') { $descr = 'LED Status Fault'; //Discover Sensors - discover_sensor($valid['sensor'], 'state', $device, $cur_oid, 'hmLEDRSFault.' . $index, $state_name, $descr, 1, 1, null, null, null, null, $temp, 'snmp'); + discover_sensor(null, 'state', $device, $cur_oid, 'hmLEDRSFault.' . $index, $state_name, $descr, 1, 1, null, null, null, null, $temp, 'snmp'); //Create Sensor To State Index create_sensor_to_state_index($device, $state_name, 'hmLEDRSFault.' . $index); diff --git a/includes/discovery/sensors/state/hp.inc.php b/includes/discovery/sensors/state/hp.inc.php index feac2ac782..ea3cbc3c78 100644 --- a/includes/discovery/sensors/state/hp.inc.php +++ b/includes/discovery/sensors/state/hp.inc.php @@ -60,7 +60,7 @@ foreach ($tables as $tablevalue) { //Discover Sensors discover_sensor( - $valid['sensor'], + null, 'state', $device, $num_oid . $index, diff --git a/includes/discovery/sensors/state/hpblmos.inc.php b/includes/discovery/sensors/state/hpblmos.inc.php index bbc2dae432..b8968fbfb4 100644 --- a/includes/discovery/sensors/state/hpblmos.inc.php +++ b/includes/discovery/sensors/state/hpblmos.inc.php @@ -26,7 +26,7 @@ foreach (explode("\n", $fans) as $fan) { ]; create_state_index($state_name, $states); } - discover_sensor($valid['sensor'], 'state', $device, $current_oid, $current_id, $fan_state_name, $descr, 1, 1, null, null, null, null, $state, 'snmp', $current_id); + discover_sensor(null, 'state', $device, $current_oid, $current_id, $fan_state_name, $descr, 1, 1, null, null, null, null, $state, 'snmp', $current_id); create_sensor_to_state_index($device, $fan_state_name, $current_id); } } @@ -58,7 +58,7 @@ foreach (explode("\n", $psus) as $psu) { ]; create_state_index($state_name, $states); } - discover_sensor($valid['sensor'], 'state', $device, $current_oid, $current_id, $psu_state_name, $descr, 1, 1, null, null, null, null, $state, 'snmp', $current_id); + discover_sensor(null, 'state', $device, $current_oid, $current_id, $psu_state_name, $descr, 1, 1, null, null, null, null, $state, 'snmp', $current_id); create_sensor_to_state_index($device, $psu_state_name, $current_id); } } diff --git a/includes/discovery/sensors/state/ibm-amm.inc.php b/includes/discovery/sensors/state/ibm-amm.inc.php index 4376865185..1bfd2e376c 100644 --- a/includes/discovery/sensors/state/ibm-amm.inc.php +++ b/includes/discovery/sensors/state/ibm-amm.inc.php @@ -39,7 +39,7 @@ foreach ($oids as $oid) { ]; create_state_index($state_name, $states); - discover_sensor($valid['sensor'], 'state', $device, $oid, $index, $state_name, $descr, 1, 1, null, null, null, null, $state, 'snmp', $index); + discover_sensor(null, 'state', $device, $oid, $index, $state_name, $descr, 1, 1, null, null, null, null, $state, 'snmp', $index); //Create Sensor To State Index create_sensor_to_state_index($device, $state_name, $index); $index++; @@ -77,7 +77,7 @@ foreach ($oids as $oid) { ]; create_state_index($state_name, $states); - discover_sensor($valid['sensor'], 'state', $device, $oid, $index, $state_name, $descr, 1, 1, null, null, null, null, $state, 'snmp', $index); + discover_sensor(null, 'state', $device, $oid, $index, $state_name, $descr, 1, 1, null, null, null, null, $state, 'snmp', $index); //Create Sensor To State Index create_sensor_to_state_index($device, $state_name, $index); $index++; @@ -111,7 +111,7 @@ foreach ($data as $oid => $array) { ]; create_state_index($state_name, $states); - discover_sensor($valid['sensor'], 'state', $device, $oid, $index, $state_name, $descr, 1, 1, null, null, null, null, $state, 'snmp', $index); + discover_sensor(null, 'state', $device, $oid, $index, $state_name, $descr, 1, 1, null, null, null, null, $state, 'snmp', $index); //Create Sensor To State Index create_sensor_to_state_index($device, $state_name, $index); $index++; diff --git a/includes/discovery/sensors/state/ict-pdu.inc.php b/includes/discovery/sensors/state/ict-pdu.inc.php index 5a3da334e4..52ee72f4e8 100644 --- a/includes/discovery/sensors/state/ict-pdu.inc.php +++ b/includes/discovery/sensors/state/ict-pdu.inc.php @@ -44,7 +44,7 @@ if (is_array($oids)) { $current_value = 2; } - discover_sensor($valid['sensor'], 'state', $device, $fuse_state_oid, $index, $state_name, $descr, 1, 1, null, null, null, null, $current_value, 'snmp', $index); + discover_sensor(null, 'state', $device, $fuse_state_oid, $index, $state_name, $descr, 1, 1, null, null, null, null, $current_value, 'snmp', $index); create_sensor_to_state_index($device, $state_name, $index); } diff --git a/includes/discovery/sensors/state/infinera-groove.inc.php b/includes/discovery/sensors/state/infinera-groove.inc.php index b6654ec7b5..efaee806f7 100644 --- a/includes/discovery/sensors/state/infinera-groove.inc.php +++ b/includes/discovery/sensors/state/infinera-groove.inc.php @@ -38,7 +38,7 @@ foreach ($pre_cache['infineragroove_slotTable'] as $index => $data) { if (is_array($data) && isset($data['cardMode'])) { // discover sensors $descr = 'slot-' . str_replace('.', '/', $index) . ' (' . $data['slotActualCardType'] . ')'; - discover_sensor($valid['sensor'], 'state', $device, $num_oid . $index, $index, $state_name, $descr, '1', '1', null, null, null, null, $data['cardMode'], 'snmp', $index); + discover_sensor(null, 'state', $device, $num_oid . $index, $index, $state_name, $descr, '1', '1', null, null, null, null, $data['cardMode'], 'snmp', $index); // create sensor to state index create_sensor_to_state_index($device, $state_name, $index); diff --git a/includes/discovery/sensors/state/innovaphone.inc.php b/includes/discovery/sensors/state/innovaphone.inc.php index 29169651e8..0a5a774cf3 100644 --- a/includes/discovery/sensors/state/innovaphone.inc.php +++ b/includes/discovery/sensors/state/innovaphone.inc.php @@ -35,7 +35,7 @@ if (! empty($oids)) { } $name = 'Interface ' . $ifname; //Discover Sensors - discover_sensor($valid['sensor'], 'state', $device, $num_oid . $index, $index, $state_name, $name, '1', '1', null, null, null, null, $entry['voiceIfState'], 'snmp', $index); + discover_sensor(null, 'state', $device, $num_oid . $index, $index, $state_name, $name, '1', '1', null, null, null, null, $entry['voiceIfState'], 'snmp', $index); //Create Sensor To State Index create_sensor_to_state_index($device, $state_name, $index); diff --git a/includes/discovery/sensors/state/juniper-mss.inc.php b/includes/discovery/sensors/state/juniper-mss.inc.php index 024bfb282a..2007de5eca 100644 --- a/includes/discovery/sensors/state/juniper-mss.inc.php +++ b/includes/discovery/sensors/state/juniper-mss.inc.php @@ -28,7 +28,7 @@ if (is_array($temp)) { foreach ($temp as $index => $entry) { $descr = $temp[$index]['trpzSysPowerSupplyDescr']; //Discover Sensors - discover_sensor($valid['sensor'], 'state', $device, $cur_oid . $index, $index, $state_name, $descr, 1, 1, null, null, null, null, $temp[$index]['trpzSysPowerSupplyStatus'], 'snmp', $index); + discover_sensor(null, 'state', $device, $cur_oid . $index, $index, $state_name, $descr, 1, 1, null, null, null, null, $temp[$index]['trpzSysPowerSupplyStatus'], 'snmp', $index); //Create Sensor To State Index create_sensor_to_state_index($device, $state_name, $index); diff --git a/includes/discovery/sensors/state/linux.inc.php b/includes/discovery/sensors/state/linux.inc.php index 012c229f39..b1036022f7 100644 --- a/includes/discovery/sensors/state/linux.inc.php +++ b/includes/discovery/sensors/state/linux.inc.php @@ -35,7 +35,7 @@ if (! empty($pre_cache['raspberry_pi_sensors'])) { ]; create_state_index($state_name, $states); - discover_sensor($valid['sensor'], 'state', $device, $oid . $codec, $codec, $state_name, $descr, 1, 1, null, null, null, null, $value, 'snmp', $codec); + discover_sensor(null, 'state', $device, $oid . $codec, $codec, $state_name, $descr, 1, 1, null, null, null, null, $value, 'snmp', $codec); create_sensor_to_state_index($device, $state_name, $codec); } else { break; diff --git a/includes/discovery/sensors/state/loop-telecom.inc.php b/includes/discovery/sensors/state/loop-telecom.inc.php index 8629d794fc..fbfd5b4796 100644 --- a/includes/discovery/sensors/state/loop-telecom.inc.php +++ b/includes/discovery/sensors/state/loop-telecom.inc.php @@ -98,7 +98,7 @@ if (! empty($oids)) { $description = $index; //Set description equials to slot name. Ex. Slot-A or Slot-1 } - discover_sensor($valid['sensor'], 'state', $device, $num_oid . $num_index, $index, $state_name, $description, '1', '1', null, null, null, null, $currentValue, 'snmp', null, null, null, 'Line cards'); + discover_sensor(null, 'state', $device, $num_oid . $num_index, $index, $state_name, $description, '1', '1', null, null, null, null, $currentValue, 'snmp', null, null, null, 'Line cards'); //Create Sensor To State Index create_sensor_to_state_index($device, $state_name, $index); $num_index = $num_index + 1; diff --git a/includes/discovery/sensors/state/netagent2.inc.php b/includes/discovery/sensors/state/netagent2.inc.php index e8e446a912..da87b2b3e9 100644 --- a/includes/discovery/sensors/state/netagent2.inc.php +++ b/includes/discovery/sensors/state/netagent2.inc.php @@ -54,7 +54,7 @@ if (! empty($ups_state) || $ups_state == 0) { $state = $ups_state / $divisor; $descr = 'UPS state'; - discover_sensor($valid['sensor'], 'state', $device, $ups_state_oid, $index, $state_name, $descr, $divisor, 1, $lowlimit, $lowwarnlimit, $warnlimit, $limit, $state); + discover_sensor(null, 'state', $device, $ups_state_oid, $index, $state_name, $descr, $divisor, 1, $lowlimit, $lowwarnlimit, $warnlimit, $limit, $state); create_sensor_to_state_index($device, $state_name, $index); } @@ -86,7 +86,7 @@ if ($in_phaseNum == '3') { $state = $ups_state / $divisor; $descr = 'In And Out'; - discover_sensor($valid['sensor'], 'state', $device, $ups_state_oid, $index, $state_name, $descr, $divisor, 1, $lowlimit, $lowwarnlimit, $warnlimit, $limit, $state); + discover_sensor(null, 'state', $device, $ups_state_oid, $index, $state_name, $descr, $divisor, 1, $lowlimit, $lowwarnlimit, $warnlimit, $limit, $state); create_sensor_to_state_index($device, $state_name, $index); } @@ -111,7 +111,7 @@ if ($in_phaseNum == '3') { $state = $ups_state / $divisor; $descr = 'Back Status'; - discover_sensor($valid['sensor'], 'state', $device, $ups_state_oid, $index, $state_name, $descr, $divisor, 1, $lowlimit, $lowwarnlimit, $warnlimit, $limit, $state); + discover_sensor(null, 'state', $device, $ups_state_oid, $index, $state_name, $descr, $divisor, 1, $lowlimit, $lowwarnlimit, $warnlimit, $limit, $state); create_sensor_to_state_index($device, $state_name, $index); } @@ -137,7 +137,7 @@ if ($in_phaseNum == '3') { $state = $ups_state / $divisor; $descr = 'Charge Status'; - discover_sensor($valid['sensor'], 'state', $device, $ups_state_oid, $index, $state_name, $descr, $divisor, 1, $lowlimit, $lowwarnlimit, $warnlimit, $limit, $state); + discover_sensor(null, 'state', $device, $ups_state_oid, $index, $state_name, $descr, $divisor, 1, $lowlimit, $lowwarnlimit, $warnlimit, $limit, $state); create_sensor_to_state_index($device, $state_name, $index); } @@ -162,7 +162,7 @@ if ($in_phaseNum == '3') { $state = $ups_state / $divisor; $descr = 'Breaker Status'; - discover_sensor($valid['sensor'], 'state', $device, $ups_state_oid, $index, $state_name, $descr, $divisor, 1, $lowlimit, $lowwarnlimit, $warnlimit, $limit, $state); + discover_sensor(null, 'state', $device, $ups_state_oid, $index, $state_name, $descr, $divisor, 1, $lowlimit, $lowwarnlimit, $warnlimit, $limit, $state); create_sensor_to_state_index($device, $state_name, $index); } @@ -187,7 +187,7 @@ if ($in_phaseNum == '3') { $state = $ups_state / $divisor; $descr = 'AC status'; - discover_sensor($valid['sensor'], 'state', $device, $ups_state_oid, $index, $state_name, $descr, $divisor, 1, $lowlimit, $lowwarnlimit, $warnlimit, $limit, $state); + discover_sensor(null, 'state', $device, $ups_state_oid, $index, $state_name, $descr, $divisor, 1, $lowlimit, $lowwarnlimit, $warnlimit, $limit, $state); create_sensor_to_state_index($device, $state_name, $index); } @@ -214,7 +214,7 @@ if ($in_phaseNum == '3') { $state = $ups_state / $divisor; $descr = 'Inverter Operating'; - discover_sensor($valid['sensor'], 'state', $device, $ups_state_oid, $index, $state_name, $descr, $divisor, 1, $lowlimit, $lowwarnlimit, $warnlimit, $limit, $state); + discover_sensor(null, 'state', $device, $ups_state_oid, $index, $state_name, $descr, $divisor, 1, $lowlimit, $lowwarnlimit, $warnlimit, $limit, $state); create_sensor_to_state_index($device, $state_name, $index); } @@ -235,7 +235,7 @@ if ($in_phaseNum == '3') { $state = $ups_state / $divisor; $descr = 'Rectifier Operating'; - discover_sensor($valid['sensor'], 'state', $device, $ups_state_oid, $index, $state_name, $descr, $divisor, 1, $lowlimit, $lowwarnlimit, $warnlimit, $limit, $state); + discover_sensor(null, 'state', $device, $ups_state_oid, $index, $state_name, $descr, $divisor, 1, $lowlimit, $lowwarnlimit, $warnlimit, $limit, $state); create_sensor_to_state_index($device, $state_name, $index); } @@ -260,7 +260,7 @@ if ($in_phaseNum == '3') { $state = $ups_state / $divisor; $descr = 'Switch Mode'; - discover_sensor($valid['sensor'], 'state', $device, $ups_state_oid, $index, $state_name, $descr, $divisor, 1, $lowlimit, $lowwarnlimit, $warnlimit, $limit, $state); + discover_sensor(null, 'state', $device, $ups_state_oid, $index, $state_name, $descr, $divisor, 1, $lowlimit, $lowwarnlimit, $warnlimit, $limit, $state); create_sensor_to_state_index($device, $state_name, $index); } @@ -287,7 +287,7 @@ if ($in_phaseNum == '3') { $state = $ups_state / $divisor; $descr = 'Rectifier Rotation Error'; - discover_sensor($valid['sensor'], 'state', $device, $ups_state_oid, $index, $state_name, $descr, $divisor, 1, $lowlimit, $lowwarnlimit, $warnlimit, $limit, $state); + discover_sensor(null, 'state', $device, $ups_state_oid, $index, $state_name, $descr, $divisor, 1, $lowlimit, $lowwarnlimit, $warnlimit, $limit, $state); create_sensor_to_state_index($device, $state_name, $index); } @@ -308,7 +308,7 @@ if ($in_phaseNum == '3') { $state = $ups_state / $divisor; $descr = 'Bypass freq. fail'; - discover_sensor($valid['sensor'], 'state', $device, $ups_state_oid, $index, $state_name, $descr, $divisor, 1, $lowlimit, $lowwarnlimit, $warnlimit, $limit, $state); + discover_sensor(null, 'state', $device, $ups_state_oid, $index, $state_name, $descr, $divisor, 1, $lowlimit, $lowwarnlimit, $warnlimit, $limit, $state); create_sensor_to_state_index($device, $state_name, $index); } @@ -329,7 +329,7 @@ if ($in_phaseNum == '3') { $state = $ups_state / $divisor; $descr = 'Short Circuit'; - discover_sensor($valid['sensor'], 'state', $device, $ups_state_oid, $index, $state_name, $descr, $divisor, 1, $lowlimit, $lowwarnlimit, $warnlimit, $limit, $state); + discover_sensor(null, 'state', $device, $ups_state_oid, $index, $state_name, $descr, $divisor, 1, $lowlimit, $lowwarnlimit, $warnlimit, $limit, $state); create_sensor_to_state_index($device, $state_name, $index); } } diff --git a/includes/discovery/sensors/state/nokia-isam.inc.php b/includes/discovery/sensors/state/nokia-isam.inc.php index 8459251992..cfafc06b8b 100644 --- a/includes/discovery/sensors/state/nokia-isam.inc.php +++ b/includes/discovery/sensors/state/nokia-isam.inc.php @@ -34,7 +34,7 @@ foreach ($snmp_data['nokiaIsamEqpBoardTable'] as $index => $data) { create_state_index($state_name, $states); //Discover Sensors - discover_sensor($valid['sensor'], 'state', $device, $oid, $index, $state_name, $descr, 1, 1, null, null, null, null, $current); + discover_sensor(null, 'state', $device, $oid, $index, $state_name, $descr, 1, 1, null, null, null, null, $current); //Create Sensor To State Index create_sensor_to_state_index($device, $state_name, $index); } diff --git a/includes/discovery/sensors/state/nxos.inc.php b/includes/discovery/sensors/state/nxos.inc.php index 4ad419db9c..88ff0c88c8 100644 --- a/includes/discovery/sensors/state/nxos.inc.php +++ b/includes/discovery/sensors/state/nxos.inc.php @@ -39,7 +39,7 @@ if (is_array($fan_trays)) { ]; create_state_index($state_name, $states); - discover_sensor($valid['sensor'], 'state', $device, $current_oid, $index, $state_name, $descr, 1, 1); + discover_sensor(null, 'state', $device, $current_oid, $index, $state_name, $descr, 1, 1); create_sensor_to_state_index($device, $state_name, $index); } } diff --git a/includes/discovery/sensors/state/pcoweb.inc.php b/includes/discovery/sensors/state/pcoweb.inc.php index c9efb9100e..40394aac5b 100644 --- a/includes/discovery/sensors/state/pcoweb.inc.php +++ b/includes/discovery/sensors/state/pcoweb.inc.php @@ -25,5 +25,5 @@ foreach ($compressors as $compressor_oid) { $number = $split_oid[count($split_oid) - 2]; $index = 'comp_' . $number; $descr = 'Compressor ' . $number; - discover_sensor($valid['sensor'], 'state', $device, $compressor_oid, $index, $type, $descr, $divisor, '1', null, null, null, null, $current); + discover_sensor(null, 'state', $device, $compressor_oid, $index, $type, $descr, $divisor, '1', null, null, null, null, $current); } diff --git a/includes/discovery/sensors/state/powervault.inc.php b/includes/discovery/sensors/state/powervault.inc.php index 4fa03b6913..7eb1f82432 100644 --- a/includes/discovery/sensors/state/powervault.inc.php +++ b/includes/discovery/sensors/state/powervault.inc.php @@ -25,6 +25,6 @@ if (is_numeric($value)) { ]; create_state_index($state_name, $states); - discover_sensor($valid['sensor'], 'state', $device, $oid, 1, $state_name, $descr, 1, 1); + discover_sensor(null, 'state', $device, $oid, 1, $state_name, $descr, 1, 1); create_sensor_to_state_index($device, $state_name, 1); } diff --git a/includes/discovery/sensors/state/printer.inc.php b/includes/discovery/sensors/state/printer.inc.php index 0ffa763ce7..134a08cb2e 100644 --- a/includes/discovery/sensors/state/printer.inc.php +++ b/includes/discovery/sensors/state/printer.inc.php @@ -17,7 +17,7 @@ if (is_numeric($state)) { ); $sensor_index = 0; discover_sensor( - $valid['sensor'], + null, 'state', $device, '.1.3.6.1.2.1.25.3.2.1.5.1', @@ -84,7 +84,7 @@ if ($state) { d_echo('Printer error state: ' . $state_name . ': ' . $state); $sensor_index = 0; discover_sensor( - $valid['sensor'], + null, 'state', $device, '.1.3.6.1.2.1.25.3.5.1.2.1', diff --git a/includes/discovery/sensors/state/procurve.inc.php b/includes/discovery/sensors/state/procurve.inc.php index dabb80c5de..a0643ca796 100644 --- a/includes/discovery/sensors/state/procurve.inc.php +++ b/includes/discovery/sensors/state/procurve.inc.php @@ -38,6 +38,6 @@ foreach ($pre_cache['procurve_hpicfSensorTable'] as $index => $data) { ]; create_state_index($state_name, $states); - discover_sensor($valid['sensor'], 'state', $device, $state_oid . $index, $state_index, $state_name, $state_descr, '1', '1', null, null, null, null, $state); + discover_sensor(null, 'state', $device, $state_oid . $index, $state_index, $state_name, $state_descr, '1', '1', null, null, null, null, $state); create_sensor_to_state_index($device, $state_name, $state_index); } diff --git a/includes/discovery/sensors/state/quanta.inc.php b/includes/discovery/sensors/state/quanta.inc.php index 274caa61a1..a1cab74f30 100644 --- a/includes/discovery/sensors/state/quanta.inc.php +++ b/includes/discovery/sensors/state/quanta.inc.php @@ -40,7 +40,7 @@ foreach ($tables as $tablevalue) { $descr = $tablevalue[3] . $index; $oid_for_entry = $tablevalue[5] . '.' . $index; - discover_sensor($valid['sensor'], 'state', $device, $oid_for_entry, $index, $state_name, $descr, 1, 1, null, null, null, null, $entry[$cur_oid], 'snmp'); + discover_sensor(null, 'state', $device, $oid_for_entry, $index, $state_name, $descr, 1, 1, null, null, null, null, $entry[$cur_oid], 'snmp'); create_sensor_to_state_index($device, $state_name, $index); } } diff --git a/includes/discovery/sensors/state/rfc1628.inc.php b/includes/discovery/sensors/state/rfc1628.inc.php index 00846e8926..cf6ac81d7c 100644 --- a/includes/discovery/sensors/state/rfc1628.inc.php +++ b/includes/discovery/sensors/state/rfc1628.inc.php @@ -27,7 +27,7 @@ if (is_numeric($state)) { $sensor_index = 0; discover_sensor( - $valid['sensor'], + null, 'state', $device, '.1.3.6.1.2.1.33.1.2.1.0', @@ -69,7 +69,7 @@ if (is_numeric($state)) { $sensor_index = 0; discover_sensor( - $valid['sensor'], + null, 'state', $device, '.1.3.6.1.2.1.33.1.4.1.0', @@ -111,7 +111,7 @@ if (is_numeric($state)) { $sensor_index = 0; $oid = oid::toNumeric('UPS-MIB::upsTestResultsSummary.0'); discover_sensor( - $valid['sensor'], + null, 'state', $device, $oid, diff --git a/includes/discovery/sensors/state/serveriron.inc.php b/includes/discovery/sensors/state/serveriron.inc.php index dcae49eb6a..cddb773d72 100644 --- a/includes/discovery/sensors/state/serveriron.inc.php +++ b/includes/discovery/sensors/state/serveriron.inc.php @@ -9,7 +9,7 @@ for ($i = 1; $i != 3; $i++) { $power_oid = '.1.3.6.1.4.1.1991.1.1.1.2.1.1.3.' . $i; $power_status = snmp_get($device, $power_oid, '-Oqv'); if (! empty($power_status)) { - discover_sensor($valid['sensor'], 'state', $device, $power_oid, 'powerstatus' . $i, 'snmp', 'Power Supply ' . $i . ' Status', 1, 1, '1', null, null, '3', $power_status); + discover_sensor(null, 'state', $device, $power_oid, 'powerstatus' . $i, 'snmp', 'Power Supply ' . $i . ' Status', 1, 1, '1', null, null, '3', $power_status); } } @@ -18,6 +18,6 @@ for ($i = 1; $i != 7; $i++) { $fan_oid = '.1.3.6.1.4.1.1991.1.1.1.3.1.1.3.' . $i; $fan_status = snmp_get($device, $fan_oid, '-Oqv'); if (! empty($fan_status)) { - discover_sensor($valid['sensor'], 'state', $device, $fan_oid, 'fanstatus' . $i, 'snmp', 'Fan ' . $i . ' Status', 1, 1, '1', null, null, '3', $fan_status); + discover_sensor(null, 'state', $device, $fan_oid, 'fanstatus' . $i, 'snmp', 'Fan ' . $i . ' Status', 1, 1, '1', null, null, '3', $fan_status); } } diff --git a/includes/discovery/sensors/state/serverscheck.inc.php b/includes/discovery/sensors/state/serverscheck.inc.php index e2c28a7ed8..e4e056825e 100644 --- a/includes/discovery/sensors/state/serverscheck.inc.php +++ b/includes/discovery/sensors/state/serverscheck.inc.php @@ -49,7 +49,7 @@ foreach ($pre_cache['serverscheck_control'] as $oid_name => $oid_value) { ]; create_state_index($state_name, $states); - discover_sensor($valid['sensor'], 'state', $device, $serverscheck_oids[$tmp_oid], $index, $state_name, $descr, 1, 1, null, null, null, null, 1); + discover_sensor(null, 'state', $device, $serverscheck_oids[$tmp_oid], $index, $state_name, $descr, 1, 1, null, null, null, null, 1); create_sensor_to_state_index($device, $state_name, $index); } } diff --git a/includes/discovery/sensors/state/sitemonitor.inc.php b/includes/discovery/sensors/state/sitemonitor.inc.php index eac91433ff..27fbbf8fff 100644 --- a/includes/discovery/sensors/state/sitemonitor.inc.php +++ b/includes/discovery/sensors/state/sitemonitor.inc.php @@ -35,7 +35,7 @@ if ($switch) { $sensor_index = 3; discover_sensor( - $valid['sensor'], + null, 'state', $device, '.1.3.6.1.4.1.32050.2.1.26.5.3', diff --git a/includes/discovery/sensors/state/sm-os.inc.php b/includes/discovery/sensors/state/sm-os.inc.php index 097c255a55..4037f52ef8 100644 --- a/includes/discovery/sensors/state/sm-os.inc.php +++ b/includes/discovery/sensors/state/sm-os.inc.php @@ -34,7 +34,7 @@ foreach ($modulation as $link => $linkEntry) { $index = "$link.$radio"; if (isset($radioEntry['linkAcmRxModulation'])) { discover_sensor( - $valid['sensor'], + null, 'state', $device, ".1.3.6.1.4.1.3373.1103.80.17.1.6.$index", @@ -46,7 +46,7 @@ foreach ($modulation as $link => $linkEntry) { } if (isset($radioEntry['linkAcmTxModulation'])) { discover_sensor( - $valid['sensor'], + null, 'state', $device, ".1.3.6.1.4.1.3373.1103.80.17.1.7.$index", diff --git a/includes/discovery/sensors/state/unix.inc.php b/includes/discovery/sensors/state/unix.inc.php index af717bba47..4482077348 100644 --- a/includes/discovery/sensors/state/unix.inc.php +++ b/includes/discovery/sensors/state/unix.inc.php @@ -59,7 +59,7 @@ if (! empty($snmpData)) { create_state_index($state_name, $states); //Discover Sensors - discover_sensor($valid['sensor'], 'state', $device, $oid, $sensor_oid, $state_name, $descr, '1', '1', null, null, null, null, $value, 'snmp', null, null, null, 'ups-nut'); + discover_sensor(null, 'state', $device, $oid, $sensor_oid, $state_name, $descr, '1', '1', null, null, null, null, $value, 'snmp', null, null, null, 'ups-nut'); //Create Sensor To State Index create_sensor_to_state_index($device, $state_name, $sensor_oid); diff --git a/includes/discovery/sensors/state/voss.inc.php b/includes/discovery/sensors/state/voss.inc.php index 9efad7b575..dff4c31cd6 100644 --- a/includes/discovery/sensors/state/voss.inc.php +++ b/includes/discovery/sensors/state/voss.inc.php @@ -40,7 +40,7 @@ if (is_array($voss_fan)) { ]; create_state_index($state_name, $states); - discover_sensor($valid['sensor'], 'state', $device, $current_oid, "rcVossSystemFanInfoOperStatus.$tray_num.$fan_num", $state_name, $descr, 1, 1, null, null, 3, 3, $state); + discover_sensor(null, 'state', $device, $current_oid, "rcVossSystemFanInfoOperStatus.$tray_num.$fan_num", $state_name, $descr, 1, 1, null, null, 3, 3, $state); create_sensor_to_state_index($device, $state_name, "rcVossSystemFanInfoOperStatus.$tray_num.$fan_num"); } } elseif (is_array($fan)) { @@ -60,7 +60,7 @@ if (is_array($voss_fan)) { ]; create_state_index($state_name, $states); - discover_sensor($valid['sensor'], 'state', $device, $current_oid, "rcChasFanOperStatus.$index", $state_name, $descr, 1, 1, null, null, 3, 3, $state); + discover_sensor(null, 'state', $device, $current_oid, "rcChasFanOperStatus.$index", $state_name, $descr, 1, 1, null, null, 3, 3, $state); create_sensor_to_state_index($device, $state_name, "rcChasFanOperStatus.$index"); } } @@ -91,7 +91,7 @@ if (is_array($power_supply)) { ]; create_state_index($state_name, $states); - discover_sensor($valid['sensor'], 'state', $device, $current_oid, "rcChasPowerSupplyOperStatus.$index", $state_name, $descr, 1, 1, null, null, 4, 4, $state); + discover_sensor(null, 'state', $device, $current_oid, "rcChasPowerSupplyOperStatus.$index", $state_name, $descr, 1, 1, null, null, 4, 4, $state); create_sensor_to_state_index($device, $state_name, "rcChasPowerSupplyOperStatus.$index"); } } diff --git a/includes/discovery/sensors/state/vrp.inc.php b/includes/discovery/sensors/state/vrp.inc.php index 0e523eee74..c240c969f0 100644 --- a/includes/discovery/sensors/state/vrp.inc.php +++ b/includes/discovery/sensors/state/vrp.inc.php @@ -48,6 +48,6 @@ foreach ($pre_cache['hwStackPortTable'] as $index => $data) { create_state_index($state_name, $states); - discover_sensor($valid['sensor'], 'state', $device, $state_oid, $state_index, $state_name, $state_descr, '1', '1', null, null, null, null, $state, 'snmp', null, null, null, 'Stack'); + discover_sensor(null, 'state', $device, $state_oid, $state_index, $state_name, $state_descr, '1', '1', null, null, null, null, $state, 'snmp', null, null, null, 'Stack'); create_sensor_to_state_index($device, $state_name, $state_index); } diff --git a/includes/discovery/sensors/state/wipipe.inc.php b/includes/discovery/sensors/state/wipipe.inc.php index 262d0c537f..8951da53f8 100644 --- a/includes/discovery/sensors/state/wipipe.inc.php +++ b/includes/discovery/sensors/state/wipipe.inc.php @@ -39,7 +39,7 @@ foreach ($pre_cache['wipipe_oids'] as $index => $entry) { $modemmdn = $entry['mdmMDN']; $descr = 'mdmStatus - ' . $modemdesc . ' - ' . $modemmdn; //Discover Sensors - discover_sensor($valid['sensor'], 'state', $device, $cur_oid . $index, $index, $state_name, $descr, 1, 1, null, null, null, null, $entry['mdmStatus'], 'snmp', $index); + discover_sensor(null, 'state', $device, $cur_oid . $index, $index, $state_name, $descr, 1, 1, null, null, null, null, $entry['mdmStatus'], 'snmp', $index); //Create Sensor To State Index create_sensor_to_state_index($device, $state_name, $index); } @@ -61,7 +61,7 @@ foreach ($upgradestatus as $index => $entry) { $descr = 'Firmware Upgrade Status'; //Discover Sensors - discover_sensor($valid['sensor'], 'state', $device, $cur_oid . $index, $index, $state_name, $descr, 1, 1, null, null, null, null, $entry['devFWUpgradeStatus'], 'snmp', $index); + discover_sensor(null, 'state', $device, $cur_oid . $index, $index, $state_name, $descr, 1, 1, null, null, null, null, $entry['devFWUpgradeStatus'], 'snmp', $index); //Create Sensor To State Index create_sensor_to_state_index($device, $state_name, $index); } diff --git a/includes/discovery/sensors/temperature/adva_fsp150.inc.php b/includes/discovery/sensors/temperature/adva_fsp150.inc.php index 1ef13ae1fe..9bd7a69e4b 100644 --- a/includes/discovery/sensors/temperature/adva_fsp150.inc.php +++ b/includes/discovery/sensors/temperature/adva_fsp150.inc.php @@ -95,7 +95,7 @@ foreach (array_keys($pre_cache['adva_fsp150']) as $index) { d_echo($pre_cache['adva_fsp150']); discover_sensor( - $valid['sensor'], + null, 'temperature', $device, $oid, @@ -128,7 +128,7 @@ foreach ($pre_cache['adva_fsp150_ports'] as $index => $entry) { $entPhysicalIndex_measured = 'ports'; $descr = ($pre_cache['adva_fsp150_ifName'][$entry['cmEthernetNetPortIfIndex']]['ifName'] ?? 'ifIndex ' . $entry['cmEthernetNetPortIfIndex']); discover_sensor( - $valid['sensor'], + null, 'temperature', $device, $oid, @@ -157,7 +157,7 @@ foreach ($pre_cache['adva_fsp150_ports'] as $index => $entry) { $entPhysicalIndex_measured = 'ports'; $descr = ($pre_cache['adva_fsp150_ifName'][$entry['cmEthernetAccPortIfIndex']]['ifName'] ?? 'ifIndex ' . $entry['cmEthernetAccPortIfIndex']); discover_sensor( - $valid['sensor'], + null, 'temperature', $device, $oid, @@ -186,7 +186,7 @@ foreach ($pre_cache['adva_fsp150_ports'] as $index => $entry) { $entPhysicalIndex_measured = 'ports'; $descr = ($pre_cache['adva_fsp150_ifName'][$entry['cmEthernetTrafficPortIfIndex']]['ifName'] ?? 'ifIndex ' . $entry['cmEthernetTrafficPortIfIndex']); discover_sensor( - $valid['sensor'], + null, 'temperature', $device, $oid, diff --git a/includes/discovery/sensors/temperature/adva_fsp3kr7.inc.php b/includes/discovery/sensors/temperature/adva_fsp3kr7.inc.php index 09aa12bc5c..32d61ae10f 100644 --- a/includes/discovery/sensors/temperature/adva_fsp3kr7.inc.php +++ b/includes/discovery/sensors/temperature/adva_fsp3kr7.inc.php @@ -32,7 +32,7 @@ if (is_array($pre_cache['adva_fsp3kr7_Card'])) { $current = $pre_cache['adva_fsp3kr7_Card'][$index]['eqptPhysInstValueTemp'] / $divisor; discover_sensor( - $valid['sensor'], + null, 'temperature', $device, $oid, diff --git a/includes/discovery/sensors/temperature/aen.inc.php b/includes/discovery/sensors/temperature/aen.inc.php index 43f022b564..6062ade6f8 100644 --- a/includes/discovery/sensors/temperature/aen.inc.php +++ b/includes/discovery/sensors/temperature/aen.inc.php @@ -26,5 +26,5 @@ $valueoid = '.1.3.6.1.4.1.22420.1.1.12.1.2.1'; // acdDescTsCurrentTemp.1 $value = snmp_get($device, $valueoid, '-Oqv'); if (is_numeric($value)) { - discover_sensor($valid['sensor'], 'temperature', $device, $valueoid, 1, 'metronid', $descr, '1', '1', $low_limit, $low_warn_limit, $high_warn_limit, $high_limit, $value); + discover_sensor(null, 'temperature', $device, $valueoid, 1, 'metronid', $descr, '1', '1', $low_limit, $low_warn_limit, $high_warn_limit, $high_limit, $value); } diff --git a/includes/discovery/sensors/temperature/akcp.inc.php b/includes/discovery/sensors/temperature/akcp.inc.php index 78a4e7a68a..72a47992ca 100644 --- a/includes/discovery/sensors/temperature/akcp.inc.php +++ b/includes/discovery/sensors/temperature/akcp.inc.php @@ -17,7 +17,7 @@ foreach ($oids as $index => $entry) { } discover_sensor( - $valid['sensor'], + null, 'temperature', $device, $oid, diff --git a/includes/discovery/sensors/temperature/aos-emu2.inc.php b/includes/discovery/sensors/temperature/aos-emu2.inc.php index 3f24197cd8..06bdcaf07d 100644 --- a/includes/discovery/sensors/temperature/aos-emu2.inc.php +++ b/includes/discovery/sensors/temperature/aos-emu2.inc.php @@ -32,6 +32,6 @@ foreach ($pre_cache['emu2_temp'] as $id => $temp) { $high_limit = fahrenheit_to_celsius($temp['emsProbeStatusProbeMaxTempThresh'], $pre_cache['emu2_temp_scale']); $high_warn_limit = fahrenheit_to_celsius($temp['emsProbeStatusProbeHighTempThresh'], $pre_cache['emu2_temp_scale']); $current = fahrenheit_to_celsius($temp['emsProbeStatusProbeTemperature'], $pre_cache['emu2_temp_scale']); - discover_sensor($valid['sensor'], 'temperature', $device, $oid, $index, 'aos-emu2', $descr, '1', '1', $low_limit, $low_warn_limit, $high_warn_limit, $high_limit, $current); + discover_sensor(null, 'temperature', $device, $oid, $index, 'aos-emu2', $descr, '1', '1', $low_limit, $low_warn_limit, $high_warn_limit, $high_limit, $current); } } diff --git a/includes/discovery/sensors/temperature/aos.inc.php b/includes/discovery/sensors/temperature/aos.inc.php index 4f2c34bda2..a12c272ad1 100644 --- a/includes/discovery/sensors/temperature/aos.inc.php +++ b/includes/discovery/sensors/temperature/aos.inc.php @@ -6,5 +6,5 @@ $descr = ''; $temperature = snmp_get($device, '.1.3.6.1.4.1.89.53.15.1.9.1', '-Oqv'); if (is_numeric($temperature) && $temperature > '0') { $descr = 'Chassis Temperature'; - discover_sensor($valid['sensor'], 'temperature', $device, '.1.3.6.1.4.1.89.53.15.1.9.1', '1', 'alcatel-device', $descr, '1', '1', null, null, null, null, $temperature); + discover_sensor(null, 'temperature', $device, '.1.3.6.1.4.1.89.53.15.1.9.1', '1', 'alcatel-device', $descr, '1', '1', null, null, null, null, $temperature); } diff --git a/includes/discovery/sensors/temperature/aos6.inc.php b/includes/discovery/sensors/temperature/aos6.inc.php index f5e0716a87..e167ea0ce4 100644 --- a/includes/discovery/sensors/temperature/aos6.inc.php +++ b/includes/discovery/sensors/temperature/aos6.inc.php @@ -12,6 +12,6 @@ foreach ($aos6_temp_oids as $index => $entry) { $warn_limit_low = '5'; $descr = 'Chassis-' . ($index - 568) . ' Temperature'; - discover_sensor($valid['sensor'], 'temperature', $device, $oid, $index, 'aos6', $descr, 1, 1, $limit_low, $warn_limit_low, $warn_limit, $limit, $value, 'snmp'); + discover_sensor(null, 'temperature', $device, $oid, $index, 'aos6', $descr, 1, 1, $limit_low, $warn_limit_low, $warn_limit, $limit, $value, 'snmp'); } } diff --git a/includes/discovery/sensors/temperature/apc.inc.php b/includes/discovery/sensors/temperature/apc.inc.php index e7d941a369..cf611b033f 100644 --- a/includes/discovery/sensors/temperature/apc.inc.php +++ b/includes/discovery/sensors/temperature/apc.inc.php @@ -19,7 +19,7 @@ if ($oids) { $index = 0; $descr = 'Internal Temperature'; - discover_sensor($valid['sensor'], 'temperature', $device, $oid, $index, $sensorType, $descr, $precision, '1', null, null, null, null, $current / $precision); + discover_sensor(null, 'temperature', $device, $oid, $index, $sensorType, $descr, $precision, '1', null, null, null, null, $current / $precision); } // Environmental monitoring on UPSes etc @@ -49,7 +49,7 @@ if ($apc_env_data) { if (count($split_index) == 2 && $split_index[1] == 1) { $index = $split_index[0]; } - discover_sensor($valid['sensor'], 'temperature', $device, $oid, $index, $sensorType, $descr, 1, 1, $low_limit, $low_warn_limit, $high_warn_limit, $high_limit, $current); + discover_sensor(null, 'temperature', $device, $oid, $index, $sensorType, $descr, 1, 1, $low_limit, $low_warn_limit, $high_warn_limit, $high_limit, $current); } } } else { @@ -72,7 +72,7 @@ if ($apc_env_data) { if ($current > 0) { // Temperature = 0 -> Sensor not available - discover_sensor($valid['sensor'], 'temperature', $device, $oid, $index, $sensorType, $descr, 1, 1, $low_limit, $low_warn_limit, $high_warn_limit, $high_limit, $current); + discover_sensor(null, 'temperature', $device, $oid, $index, $sensorType, $descr, 1, 1, $low_limit, $low_warn_limit, $high_warn_limit, $high_limit, $current); } } } @@ -91,7 +91,7 @@ foreach (array_keys($apc_env_data) as $index) { $high_warn_limit = $apc_env_data[$index]['emsProbeStatusProbeHighTempThresh']; $high_limit = $apc_env_data[$index]['emsProbeStatusProbeMaxTempThresh']; - discover_sensor($valid['sensor'], 'temperature', $device, $oid, $index, $sensorType, $descr, '1', '1', $low_limit, $low_warn_limit, $high_warn_limit, $high_limit, $current); + discover_sensor(null, 'temperature', $device, $oid, $index, $sensorType, $descr, '1', '1', $low_limit, $low_warn_limit, $high_warn_limit, $high_limit, $current); } } @@ -111,7 +111,7 @@ if ($oids) { [$oid,$current] = explode(' ', $oids); $divisor = 10; $sensorType = substr($descr, 0, 2); - discover_sensor($valid['sensor'], 'temperature', $device, $oid, '0', $sensorType, $descr, $divisor, '1', null, null, null, null, $current); + discover_sensor(null, 'temperature', $device, $oid, '0', $sensorType, $descr, $divisor, '1', null, null, null, null, $current); } } @@ -137,7 +137,7 @@ if ($oids !== false) { $descr = 'Supply Temperature'; } - discover_sensor($valid['sensor'], 'temperature', $device, $oid, $index, $sensorType, $descr, $precision, '1', null, null, null, null, $current); + discover_sensor(null, 'temperature', $device, $oid, $index, $sensorType, $descr, $precision, '1', null, null, null, null, $current); } unset($oids); @@ -159,7 +159,7 @@ if ($oids !== false) { $descr = 'Return Temperature'; } - discover_sensor($valid['sensor'], 'temperature', $device, $oid, $index, $sensorType, $descr, $precision, '1', null, null, null, null, $current); + discover_sensor(null, 'temperature', $device, $oid, $index, $sensorType, $descr, $precision, '1', null, null, null, null, $current); } unset($oids); @@ -180,7 +180,7 @@ if ($oids !== false) { $descr = 'Remote Temperature'; } - discover_sensor($valid['sensor'], 'temperature', $device, $oid, $index, $sensorType, $descr, $precision, '1', null, null, null, null, $current); + discover_sensor(null, 'temperature', $device, $oid, $index, $sensorType, $descr, $precision, '1', null, null, null, null, $current); } $cooling_unit = snmpwalk_cache_oid($device, 'coolingUnitExtendedAnalogEntry', [], 'PowerNet-MIB'); @@ -190,7 +190,7 @@ foreach ($cooling_unit as $index => $data) { $scale = $data['coolingUnitExtendedAnalogScale']; $value = $data['coolingUnitExtendedAnalogValue']; if (preg_match('/Temperature/', $descr) && $data['coolingUnitExtendedAnalogUnits'] == 'C' && $value >= 0) { - discover_sensor($valid['sensor'], 'temperature', $device, $cur_oid, $cur_oid, 'apc', $descr, $scale, 1, null, null, null, null, $value); + discover_sensor(null, 'temperature', $device, $cur_oid, $cur_oid, 'apc', $descr, $scale, 1, null, null, null, null, $value); } } @@ -200,7 +200,7 @@ foreach ($pre_cache['cooling_unit_analog'] as $index => $data) { $scale = $data['coolingUnitStatusAnalogScale'] ?? null; $value = $data['coolingUnitStatusAnalogValue'] ?? null; if (preg_match('/Temperature/', $descr) && $data['coolingUnitStatusAnalogUnits'] == 'C' && $value >= 0) { - discover_sensor($valid['sensor'], 'temperature', $device, $cur_oid, $cur_oid, 'apc', $descr, $scale, 1, null, null, null, null, $value); + discover_sensor(null, 'temperature', $device, $cur_oid, $cur_oid, 'apc', $descr, $scale, 1, null, null, null, null, $value); } } @@ -215,6 +215,6 @@ foreach ($pre_cache['mem_sensors_status'] as $index => $data) { if ($pre_cache['memSensorsStatusSysTempUnits'] === 'fahrenheit') { $user_func = 'fahrenheit_to_celsius'; } - discover_sensor($valid['sensor'], 'temperature', $device, $cur_oid, 'memSensorsTemperature.' . $index, 'apc', $descr, $divisor, $multiplier, null, null, null, null, $value, 'snmp', null, null, $user_func); + discover_sensor(null, 'temperature', $device, $cur_oid, 'memSensorsTemperature.' . $index, 'apc', $descr, $divisor, $multiplier, null, null, null, null, $value, 'snmp', null, null, $user_func); } } diff --git a/includes/discovery/sensors/temperature/areca.inc.php b/includes/discovery/sensors/temperature/areca.inc.php index 3ae0f35d31..655de29564 100644 --- a/includes/discovery/sensors/temperature/areca.inc.php +++ b/includes/discovery/sensors/temperature/areca.inc.php @@ -18,7 +18,7 @@ foreach (explode("\n", $oids) as $data) { $temperature = snmp_get($device, $temperature_oid, '-Oqv', ''); $descr = "Hard disk $temperature_id"; if ($temperature != -128) { // -128 = not measured/present - discover_sensor($valid['sensor'], 'temperature', $device, $temperature_oid, zeropad($temperature_id), 'areca', $descr, '1', '1', null, null, null, null, $temperature); + discover_sensor(null, 'temperature', $device, $temperature_oid, zeropad($temperature_id), 'areca', $descr, '1', '1', null, null, null, null, $temperature); } } } @@ -41,6 +41,6 @@ foreach (explode("\n", $oids) as $data) { $oid = '.1.3.6.1.4.1.18928.1.2.2.1.10.1.3.' . $index; $current = snmp_get($device, $oid, '-Oqv', ''); - discover_sensor($valid['sensor'], 'temperature', $device, $oid, $index, 'areca', trim($descr, '"'), '1', '1', null, null, null, null, $current); + discover_sensor(null, 'temperature', $device, $oid, $index, 'areca', trim($descr, '"'), '1', '1', null, null, null, null, $current); } } diff --git a/includes/discovery/sensors/temperature/arris-c4.inc.php b/includes/discovery/sensors/temperature/arris-c4.inc.php index 1b766d76ed..a0b3bc4fae 100644 --- a/includes/discovery/sensors/temperature/arris-c4.inc.php +++ b/includes/discovery/sensors/temperature/arris-c4.inc.php @@ -13,6 +13,6 @@ foreach ($oids as $index => $entry) { $warnlimit = $entry['cardTemperatureHighWarn']; $limit = $entry['cardTemperatureHighError']; - discover_sensor($valid['sensor'], 'temperature', $device, $temperature_oid, $index, 'cmts', $descr, '1', '1', null, null, $warnlimit, $limit, $tempCurr); + discover_sensor(null, 'temperature', $device, $temperature_oid, $index, 'cmts', $descr, '1', '1', null, null, $warnlimit, $limit, $tempCurr); } } diff --git a/includes/discovery/sensors/temperature/ats.inc.php b/includes/discovery/sensors/temperature/ats.inc.php index 31faedecf3..4dfd7fc983 100644 --- a/includes/discovery/sensors/temperature/ats.inc.php +++ b/includes/discovery/sensors/temperature/ats.inc.php @@ -14,5 +14,5 @@ if (is_numeric($temperature['0']['atsMiscellaneousGroupAtsSystemTemperture'])) { $temperature['0']['high_warn'] = $temperature['0']['emdConfigTempHighSetPoint'] - 5; $temperature['0']['low_warn'] = $temperature['0']['emdConfigTempLowSetPoint'] + 5; $temperature['0']['oid'] = '.1.3.6.1.4.1.37662.1.2.2.1.1.5.1.0'; - discover_sensor($valid['sensor'], 'temperature', $device, $temperature['0']['oid'], 'atsMiscellaneousGroupAtsSystemTemperture', 'ats', 'System', '1', '1', $temperature['0']['emdConfigTempLowSetPoint'], $temperature['0']['low_warn'], $temperature['0']['high_warn'], $temperature['0']['emdConfigTempHighSetPoint'], $temperature['0']['atsMiscellaneousGroupAtsSystemTemperture']); + discover_sensor(null, 'temperature', $device, $temperature['0']['oid'], 'atsMiscellaneousGroupAtsSystemTemperture', 'ats', 'System', '1', '1', $temperature['0']['emdConfigTempLowSetPoint'], $temperature['0']['low_warn'], $temperature['0']['high_warn'], $temperature['0']['emdConfigTempHighSetPoint'], $temperature['0']['atsMiscellaneousGroupAtsSystemTemperture']); } diff --git a/includes/discovery/sensors/temperature/awplus.inc.php b/includes/discovery/sensors/temperature/awplus.inc.php index f62d3dc792..dcdcebbf6c 100644 --- a/includes/discovery/sensors/temperature/awplus.inc.php +++ b/includes/discovery/sensors/temperature/awplus.inc.php @@ -15,7 +15,7 @@ if ($pre_cache['awplus-sfpddm']) { $descr = $tmp['ifName']; $oid = '.1.3.6.1.4.1.207.8.4.4.3.28.1.1.1.3.' . $index; discover_sensor( - $valid['sensor'], + null, 'temperature', $device, $oid, diff --git a/includes/discovery/sensors/temperature/axiscam.inc.php b/includes/discovery/sensors/temperature/axiscam.inc.php index 82fe465615..429bc9f3b1 100644 --- a/includes/discovery/sensors/temperature/axiscam.inc.php +++ b/includes/discovery/sensors/temperature/axiscam.inc.php @@ -49,5 +49,5 @@ foreach (array_keys($oids) as $index) { $current = $oids[$index]['tempSensorValue']; $oid = $cur_oid . $index; - discover_sensor($valid['sensor'], 'temperature', $device, $oid, $index, 'axiscam', 'Temperature Sensor ' . $index, '1', '1', $low_limit, $low_warn_limit, $high_warn_limit, $high_limit, $current); + discover_sensor(null, 'temperature', $device, $oid, $index, 'axiscam', 'Temperature Sensor ' . $index, '1', '1', $low_limit, $low_warn_limit, $high_warn_limit, $high_limit, $current); } diff --git a/includes/discovery/sensors/temperature/beagleboard.inc.php b/includes/discovery/sensors/temperature/beagleboard.inc.php index 966ea60203..6b47f490e1 100644 --- a/includes/discovery/sensors/temperature/beagleboard.inc.php +++ b/includes/discovery/sensors/temperature/beagleboard.inc.php @@ -32,7 +32,7 @@ for ($temp = 0; $temp < 5; $temp++) { } if (is_numeric($value[$temp])) { // Need to scale down by 1000 (initial value, and added sensor). Scaling values are integer, but accepted approach seems to be setting as a string - discover_sensor($valid['sensor'], 'temperature', $device, $oid . '.' . ($temp + 1), $temp, $type, $descr, '1000', '1', null, null, null, null, $value[$temp] / 1000); + discover_sensor(null, 'temperature', $device, $oid . '.' . ($temp + 1), $temp, $type, $descr, '1000', '1', null, null, null, null, $value[$temp] / 1000); } else { break; } diff --git a/includes/discovery/sensors/temperature/benuos.inc.php b/includes/discovery/sensors/temperature/benuos.inc.php index ab68de1604..a927a70965 100644 --- a/includes/discovery/sensors/temperature/benuos.inc.php +++ b/includes/discovery/sensors/temperature/benuos.inc.php @@ -15,6 +15,6 @@ for ($index = 1; $index <= 3; $index++) { //Benu Temp Sensors are index 1 thru 3 $sensor_oid = ".1.3.6.1.4.1.39406.1.1.1.4.1.1.5.1.$index"; $descr = $data["1.$index"]['benuSensorName'] ?? null; $current = $data["1.$index"]['benuSensorValue'] ?? null; - discover_sensor($valid['sensor'], 'temperature', $device, $sensor_oid, $sensor_index, 'benuos', $descr, '1', '1', null, null, null, null, $current); + discover_sensor(null, 'temperature', $device, $sensor_oid, $sensor_index, 'benuos', $descr, '1', '1', null, null, null, null, $current); $sensor_index++; }//end loop diff --git a/includes/discovery/sensors/temperature/binos.inc.php b/includes/discovery/sensors/temperature/binos.inc.php index 71fcee8eef..8f88827a2a 100644 --- a/includes/discovery/sensors/temperature/binos.inc.php +++ b/includes/discovery/sensors/temperature/binos.inc.php @@ -26,6 +26,6 @@ if (strpos($device['sysObjectID'], '.1.3.6.1.4.1.738.1.5.100') !== false) { $value = str_replace('"', '', $value); if (is_numeric($value)) { - discover_sensor($valid['sensor'], 'temperature', $device, $valueoid, 1, 'binos', $descr, '1', '1', $low_limit, $low_warn_limit, $high_warn_limit, $high_limit, $value); + discover_sensor(null, 'temperature', $device, $valueoid, 1, 'binos', $descr, '1', '1', $low_limit, $low_warn_limit, $high_warn_limit, $high_limit, $value); } } diff --git a/includes/discovery/sensors/temperature/binox.inc.php b/includes/discovery/sensors/temperature/binox.inc.php index 0fc34fbd97..0b38ef7af8 100644 --- a/includes/discovery/sensors/temperature/binox.inc.php +++ b/includes/discovery/sensors/temperature/binox.inc.php @@ -27,6 +27,6 @@ if (strpos($device['sysObjectID'], '.1.3.6.1.4.1.738.10.5.100') !== false) { $value = str_replace('"', '', $value); if (is_numeric($value)) { - discover_sensor($valid['sensor'], 'temperature', $device, $valueoid, 1, 'binox', $descr, '1', '1', $low_limit, $low_warn_limit, $high_warn_limit, $high_limit, $value); + discover_sensor(null, 'temperature', $device, $valueoid, 1, 'binox', $descr, '1', '1', $low_limit, $low_warn_limit, $high_warn_limit, $high_limit, $value); } } diff --git a/includes/discovery/sensors/temperature/boss.inc.php b/includes/discovery/sensors/temperature/boss.inc.php index f2866c7512..ddc7b3d76e 100644 --- a/includes/discovery/sensors/temperature/boss.inc.php +++ b/includes/discovery/sensors/temperature/boss.inc.php @@ -12,5 +12,5 @@ foreach (explode("\n", $temps) as $i => $t) { // Sensors are reported as 2 * value $divisor = 2; $val = (cast_number($val) / $divisor); - discover_sensor($valid['sensor'], 'temperature', $device, $oid, zeropad($i + 1), 'avaya-ers', 'Unit ' . ($i + 1) . ' temperature', $divisor, 1, null, null, null, null, $val); + discover_sensor(null, 'temperature', $device, $oid, zeropad($i + 1), 'avaya-ers', 'Unit ' . ($i + 1) . ' temperature', $divisor, 1, null, null, null, null, $val); } diff --git a/includes/discovery/sensors/temperature/calix.inc.php b/includes/discovery/sensors/temperature/calix.inc.php index 26364c053e..90c1da928e 100644 --- a/includes/discovery/sensors/temperature/calix.inc.php +++ b/includes/discovery/sensors/temperature/calix.inc.php @@ -29,7 +29,7 @@ if (strstr($device['sysObjectID'], '.1.3.6.1.4.1.6321.1.2.3')) { // E5-1xx Serie $descr = str_replace('"', '', $descr); $current = $temperature; - discover_sensor($valid['sensor'], 'temperature', $device, $temperature_oid, $oid, 'calix', $descr, '1', '1', null, null, null, null, $current); + discover_sensor(null, 'temperature', $device, $temperature_oid, $oid, 'calix', $descr, '1', '1', null, null, null, null, $current); } } } @@ -49,7 +49,7 @@ if (strstr($device['sysObjectID'], '.1.3.6.1.4.1.6321.1.2.3')) { // E5-1xx Serie $descr = str_replace('"', '', $descr); $current = $temperature; - discover_sensor($valid['sensor'], 'temperature', $device, $temperature_oid, $oid, 'calix', $descr, '1', '1', null, null, null, null, $current); + discover_sensor(null, 'temperature', $device, $temperature_oid, $oid, 'calix', $descr, '1', '1', null, null, null, null, $current); } } } @@ -69,7 +69,7 @@ if (strstr($device['sysObjectID'], '.1.3.6.1.4.1.6321.1.2.3')) { // E5-1xx Serie $descr = str_replace('"', '', $descr); $current = $temperature; - discover_sensor($valid['sensor'], 'temperature', $device, $temperature_oid, $oid, 'calix', $descr, '1', '1', null, null, null, null, $current); + discover_sensor(null, 'temperature', $device, $temperature_oid, $oid, 'calix', $descr, '1', '1', null, null, null, null, $current); } } } @@ -89,7 +89,7 @@ if (strstr($device['sysObjectID'], '.1.3.6.1.4.1.6321.1.2.3')) { // E5-1xx Serie $descr = str_replace('"', '', $descr); $current = $temperature; - discover_sensor($valid['sensor'], 'temperature', $device, $temperature_oid, $oid, 'calix', $descr, '1', '1', null, null, null, null, $current); + discover_sensor(null, 'temperature', $device, $temperature_oid, $oid, 'calix', $descr, '1', '1', null, null, null, null, $current); } } } diff --git a/includes/discovery/sensors/temperature/cisco.inc.php b/includes/discovery/sensors/temperature/cisco.inc.php index dcd7f93587..6c3b31e682 100644 --- a/includes/discovery/sensors/temperature/cisco.inc.php +++ b/includes/discovery/sensors/temperature/cisco.inc.php @@ -19,7 +19,7 @@ if (is_array($temp)) { } if ($temp[$index]['ciscoEnvMonTemperatureState'] != 'notPresent' && ! empty($temp[$index]['ciscoEnvMonTemperatureStatusDescr'])) { $descr = ucwords($temp[$index]['ciscoEnvMonTemperatureStatusDescr']); - discover_sensor($valid['sensor'], 'temperature', $device, $cur_oid . $index, $index, 'cisco', $descr, '1', '1', null, null, null, $temp[$index]['ciscoEnvMonTemperatureThreshold'], $temp[$index]['ciscoEnvMonTemperatureStatusValue'], 'snmp', $index); + discover_sensor(null, 'temperature', $device, $cur_oid . $index, $index, 'cisco', $descr, '1', '1', null, null, null, $temp[$index]['ciscoEnvMonTemperatureThreshold'], $temp[$index]['ciscoEnvMonTemperatureStatusValue'], 'snmp', $index); } } } @@ -29,6 +29,6 @@ if (is_array($temp)) { $cur_oid = '.1.3.6.1.4.1.9.9.661.1.1.1.12.'; foreach ($temp as $index => $entry) { $descr = snmp_get($device, 'entPhysicalName.' . $index, '-Oqv', 'ENTITY-MIB'); - discover_sensor($valid['sensor'], 'temperature', $device, $cur_oid . $index, $index, 'cisco', $descr, '1', '1', null, null, null, $temp[$index]['ciscoEnvMonTemperatureThreshold'] ?? null, $temp[$index]['c3gModemTemperature'], 'snmp', $index); + discover_sensor(null, 'temperature', $device, $cur_oid . $index, $index, 'cisco', $descr, '1', '1', null, null, null, $temp[$index]['ciscoEnvMonTemperatureThreshold'] ?? null, $temp[$index]['c3gModemTemperature'], 'snmp', $index); } } diff --git a/includes/discovery/sensors/temperature/ciscosb.inc.php b/includes/discovery/sensors/temperature/ciscosb.inc.php index de80ccde9f..aa36606b6a 100644 --- a/includes/discovery/sensors/temperature/ciscosb.inc.php +++ b/includes/discovery/sensors/temperature/ciscosb.inc.php @@ -28,7 +28,7 @@ foreach ($pre_cache['ciscosb_rlPhyTestGetResult'] as $index => $ciscosb_data) { $entPhysicalIndex = $index; $entPhysicalIndex_measured = 'ports'; if (is_numeric($temperature) && ($value['rlPhyTestTableTransceiverSupply'] != 0)) { - discover_sensor($valid['sensor'], 'temperature', $device, $oid, $index, $sensor_type, $descr, $divisor, $multiplier, null, null, null, null, $temperature, 'snmp', $entPhysicalIndex, $entPhysicalIndex_measured); + discover_sensor(null, 'temperature', $device, $oid, $index, $sensor_type, $descr, $divisor, $multiplier, null, null, null, null, $temperature, 'snmp', $entPhysicalIndex, $entPhysicalIndex_measured); } } } diff --git a/includes/discovery/sensors/temperature/ciscowlc.inc.php b/includes/discovery/sensors/temperature/ciscowlc.inc.php index c58ca08a19..ba04bc7c46 100644 --- a/includes/discovery/sensors/temperature/ciscowlc.inc.php +++ b/includes/discovery/sensors/temperature/ciscowlc.inc.php @@ -21,6 +21,6 @@ if (is_array($temp)) { foreach ($temp as $index => $entry) { $descr = 'Unit Temperature ' . $index; echo " $descr, "; - discover_sensor($valid['sensor'], 'temperature', $device, $cur_oid . $index, $index, 'wlc', $descr, '1', '1', null, $low[$index]['bsnTemperatureAlarmLowLimit'], $high[$index]['bsnTemperatureAlarmHighLimit'], null, $temp[$index]['bsnSensorTemperature'], 'snmp', $index); + discover_sensor(null, 'temperature', $device, $cur_oid . $index, $index, 'wlc', $descr, '1', '1', null, $low[$index]['bsnTemperatureAlarmLowLimit'], $high[$index]['bsnTemperatureAlarmHighLimit'], null, $temp[$index]['bsnSensorTemperature'], 'snmp', $index); } } diff --git a/includes/discovery/sensors/temperature/commander-plus.inc.php b/includes/discovery/sensors/temperature/commander-plus.inc.php index 0b09ca3ed1..0547f4c90e 100644 --- a/includes/discovery/sensors/temperature/commander-plus.inc.php +++ b/includes/discovery/sensors/temperature/commander-plus.inc.php @@ -27,4 +27,4 @@ $oid = '.1.3.6.1.4.1.18642.1.2.2.2.0'; $descr = 'Battery temperature'; $divisor = 1; $multiplier = 1; -discover_sensor($valid['sensor'], 'temperature', $device, $oid, 'batteryTemperature', 'commander-plus', $descr, $divisor, $multiplier, null, null, null, null, $current); +discover_sensor(null, 'temperature', $device, $oid, 'batteryTemperature', 'commander-plus', $descr, $divisor, $multiplier, null, null, null, null, $current); diff --git a/includes/discovery/sensors/temperature/compas.inc.php b/includes/discovery/sensors/temperature/compas.inc.php index d14780bc8b..a687730ea8 100644 --- a/includes/discovery/sensors/temperature/compas.inc.php +++ b/includes/discovery/sensors/temperature/compas.inc.php @@ -28,5 +28,5 @@ $index = 0; if (is_numeric($batteryTemp)) { $sensorType = 'compas'; $descr = 'Battery Temperature'; - discover_sensor($valid['sensor'], 'temperature', $device, $curOID, $index, $sensorType, $descr, '1', '1', null, null, null, null, $batteryTemp); + discover_sensor(null, 'temperature', $device, $curOID, $index, $sensorType, $descr, '1', '1', null, null, null, null, $batteryTemp); } diff --git a/includes/discovery/sensors/temperature/comware.inc.php b/includes/discovery/sensors/temperature/comware.inc.php index 13021aac1f..f94cff7aa9 100644 --- a/includes/discovery/sensors/temperature/comware.inc.php +++ b/includes/discovery/sensors/temperature/comware.inc.php @@ -32,7 +32,7 @@ if (! empty($entphydata)) { } $cur_oid = '.1.3.6.1.4.1.25506.2.6.1.1.1.1.12.'; discover_sensor( - $valid['sensor'], + null, 'temperature', $device, $cur_oid . $tempindex, @@ -74,6 +74,6 @@ foreach ($pre_cache['comware_oids'] as $index => $entry) { $entPhysicalIndex_measured = 'ports'; $descr = makeshortif($interface['ifDescr']) . ' Module'; - discover_sensor($valid['sensor'], 'temperature', $device, $oid, 'temp-trans-' . $index, 'comware', $descr, $divisor, $multiplier, $limit_low, $warn_limit_low, $warn_limit, $limit, $current, 'snmp', $entPhysicalIndex, $entPhysicalIndex_measured); + discover_sensor(null, 'temperature', $device, $oid, 'temp-trans-' . $index, 'comware', $descr, $divisor, $multiplier, $limit_low, $warn_limit_low, $warn_limit, $limit, $current, 'snmp', $entPhysicalIndex, $entPhysicalIndex_measured); } } diff --git a/includes/discovery/sensors/temperature/dell.inc.php b/includes/discovery/sensors/temperature/dell.inc.php index b2cf652209..29b167796a 100644 --- a/includes/discovery/sensors/temperature/dell.inc.php +++ b/includes/discovery/sensors/temperature/dell.inc.php @@ -23,6 +23,6 @@ if (is_array($temp)) { $warnlimit = $temp[$index]['temperatureProbeUpperNonCriticalThreshold'] / $divisor; $limit = $temp[$index]['temperatureProbeUpperCriticalThreshold'] / $divisor; - discover_sensor($valid['sensor'], 'temperature', $device, $cur_oid . $index, $index, 'dell', $descr, $divisor, '1', $lowlimit, $low_warn_limit, $warnlimit, $limit, $value, 'snmp', $index); + discover_sensor(null, 'temperature', $device, $cur_oid . $index, $index, 'dell', $descr, $divisor, '1', $lowlimit, $low_warn_limit, $warnlimit, $limit, $value, 'snmp', $index); } } diff --git a/includes/discovery/sensors/temperature/dhcpatriot.inc.php b/includes/discovery/sensors/temperature/dhcpatriot.inc.php index 4b293c92ce..1d8031d5c9 100644 --- a/includes/discovery/sensors/temperature/dhcpatriot.inc.php +++ b/includes/discovery/sensors/temperature/dhcpatriot.inc.php @@ -27,7 +27,7 @@ $group = null; if (! empty($current) && is_numeric($current)) { discover_sensor( - $valid['sensor'], + null, $class, $device, $oid, diff --git a/includes/discovery/sensors/temperature/dnos.inc.php b/includes/discovery/sensors/temperature/dnos.inc.php index 405a1c17af..70732e0bb1 100644 --- a/includes/discovery/sensors/temperature/dnos.inc.php +++ b/includes/discovery/sensors/temperature/dnos.inc.php @@ -13,7 +13,7 @@ if (! empty($temps)) { if (substr($oid, -1) == '1') { // This code will only pull CPU temp for each stack member, but there is no reason why the additional values couldn't be graphed $counter = $counter + 1; - discover_sensor($valid['sensor'], 'temperature', $device, $oid, $counter, 'dnos', 'Unit ' . $counter . ' CPU temperature', '1', '1', null, null, null, null, $val); + discover_sensor(null, 'temperature', $device, $oid, $counter, 'dnos', 'Unit ' . $counter . ' CPU temperature', '1', '1', null, null, null, null, $val); } } } @@ -31,6 +31,6 @@ if (is_array($oids)) { $descr = 'Unit ' . $index . ' ' . $entry['chStackUnitSysType']; $oid = '.1.3.6.1.4.1.6027.3.10.1.2.2.1.14.' . $index; $current = $entry['chStackUnitTemp']; - discover_sensor($valid['sensor'], 'temperature', $device, $oid, $index, 'ftos-sseries', $descr, '1', '1', null, null, null, null, $current); + discover_sensor(null, 'temperature', $device, $oid, $index, 'ftos-sseries', $descr, '1', '1', null, null, null, null, $current); } } diff --git a/includes/discovery/sensors/temperature/drac.inc.php b/includes/discovery/sensors/temperature/drac.inc.php index 0191943d76..92fdd35a7f 100644 --- a/includes/discovery/sensors/temperature/drac.inc.php +++ b/includes/discovery/sensors/temperature/drac.inc.php @@ -37,7 +37,7 @@ foreach (explode("\n", $oids) as $data) { $limit = snmp_get($device, $limit_oid, '-Oqv', 'IDRAC-MIB-SMIv2'); $lowlimit = snmp_get($device, $lowlimit_oid, '-Oqv', 'IDRAC-MIB-SMIv2'); - discover_sensor($valid['sensor'], 'temperature', $device, $temperature_oid, $temperature_id, 'drac', $descr, '10', '1', $lowlimit / 10, $lowwarnlimit / 10, $warnlimit / 10, $limit / 10, $temperature / 10); + discover_sensor(null, 'temperature', $device, $temperature_oid, $temperature_id, 'drac', $descr, '10', '1', $lowlimit / 10, $lowwarnlimit / 10, $warnlimit / 10, $limit / 10, $temperature / 10); } }//end if } diff --git a/includes/discovery/sensors/temperature/eltex-mes21xx.inc.php b/includes/discovery/sensors/temperature/eltex-mes21xx.inc.php index 0c1f441716..b523ea40a4 100644 --- a/includes/discovery/sensors/temperature/eltex-mes21xx.inc.php +++ b/includes/discovery/sensors/temperature/eltex-mes21xx.inc.php @@ -41,7 +41,7 @@ if ($oids) { $tmp = get_port_by_index_cache($device['device_id'], $ifIndex); $descr = $tmp['ifName']; discover_sensor( - $valid['sensor'], 'temperature', $device, $split, 'SfpTemp' . $ifIndex, 'rlPhyTestTableTransceiverTemp', 'SfpTemp-' . $descr, $divisor, '1', $low_limit, $low_warn_limit, $high_warn_limit, $high_limit, $value + null, 'temperature', $device, $split, 'SfpTemp' . $ifIndex, 'rlPhyTestTableTransceiverTemp', 'SfpTemp-' . $descr, $divisor, '1', $low_limit, $low_warn_limit, $high_warn_limit, $high_limit, $value ); } } diff --git a/includes/discovery/sensors/temperature/eltex-mes23xx.inc.php b/includes/discovery/sensors/temperature/eltex-mes23xx.inc.php index 90792d4f9b..63a01019e4 100644 --- a/includes/discovery/sensors/temperature/eltex-mes23xx.inc.php +++ b/includes/discovery/sensors/temperature/eltex-mes23xx.inc.php @@ -37,7 +37,7 @@ if ($pre_cache['eltex-mes23xx-sfp']) { $descr = $tmp['ifName']; $oid = '.1.3.6.1.4.1.89.90.1.2.1.3.' . $ifIndex . '.5'; discover_sensor( - $valid['sensor'], + null, 'temperature', $device, $oid, diff --git a/includes/discovery/sensors/temperature/eltex-mes24xx.inc.php b/includes/discovery/sensors/temperature/eltex-mes24xx.inc.php index c8dd26767f..b95faeb12d 100644 --- a/includes/discovery/sensors/temperature/eltex-mes24xx.inc.php +++ b/includes/discovery/sensors/temperature/eltex-mes24xx.inc.php @@ -46,7 +46,7 @@ if (! empty($eltexPhyTransceiverDiagnosticTable['temperature'])) { $descr = get_port_by_index_cache($device['device_id'], $ifIndex)['ifName']; $oid = Oid::toNumeric('ELTEX-PHY-MIB::eltexPhyTransceiverDiagnosticCurrentValue.' . $ifIndex . '.1.1'); discover_sensor( - $valid['sensor'], + null, 'temperature', $device, $oid, diff --git a/includes/discovery/sensors/temperature/eltex-olt.inc.php b/includes/discovery/sensors/temperature/eltex-olt.inc.php index 8ca495ad38..358d20d5ea 100644 --- a/includes/discovery/sensors/temperature/eltex-olt.inc.php +++ b/includes/discovery/sensors/temperature/eltex-olt.inc.php @@ -31,7 +31,7 @@ if (is_numeric($tmp_eltex['.1.3.6.1.4.1.35265.1.22.1.10.10.0'])) { $descr = 'Sensor 1 Temp'; $divisor = 1; $current = $tmp_eltex[$oid]; - discover_sensor($valid['sensor'], 'temperature', $device, $oid, $index, $type, $descr, $divisor, '1', null, null, null, null, $current); + discover_sensor(null, 'temperature', $device, $oid, $index, $type, $descr, $divisor, '1', null, null, null, null, $current); } if (is_numeric($tmp_eltex['.1.3.6.1.4.1.35265.1.22.1.10.11.0'])) { @@ -41,7 +41,7 @@ if (is_numeric($tmp_eltex['.1.3.6.1.4.1.35265.1.22.1.10.11.0'])) { $descr = 'Sensor 2 Temp'; $divisor = 1; $current = $tmp_eltex[$oid]; - discover_sensor($valid['sensor'], 'temperature', $device, $oid, $index, $type, $descr, $divisor, '1', null, null, null, null, $current); + discover_sensor(null, 'temperature', $device, $oid, $index, $type, $descr, $divisor, '1', null, null, null, null, $current); } if (is_numeric($tmp_eltex['.1.3.6.1.4.1.35265.1.22.1.10.12.0']) && $tmp_eltex['.1.3.6.1.4.1.35265.1.22.1.10.12.0'] != 65535) { @@ -51,7 +51,7 @@ if (is_numeric($tmp_eltex['.1.3.6.1.4.1.35265.1.22.1.10.12.0']) && $tmp_eltex['. $descr = 'Sensor 1 External Temp'; $divisor = 1; $current = $tmp_eltex[$oid]; - discover_sensor($valid['sensor'], 'temperature', $device, $oid, $index, $type, $descr, $divisor, '1', null, null, null, null, $current); + discover_sensor(null, 'temperature', $device, $oid, $index, $type, $descr, $divisor, '1', null, null, null, null, $current); } if (is_numeric($tmp_eltex['.1.3.6.1.4.1.35265.1.22.1.10.13.0']) && $tmp_eltex['.1.3.6.1.4.1.35265.1.22.1.10.13.0'] != 65535) { @@ -61,7 +61,7 @@ if (is_numeric($tmp_eltex['.1.3.6.1.4.1.35265.1.22.1.10.13.0']) && $tmp_eltex['. $descr = 'Sensor 2 External Temp'; $divisor = 1; $current = $tmp_eltex[$oid]; - discover_sensor($valid['sensor'], 'temperature', $device, $oid, $index, $type, $descr, $divisor, '1', null, null, null, null, $current); + discover_sensor(null, 'temperature', $device, $oid, $index, $type, $descr, $divisor, '1', null, null, null, null, $current); } unset($tmp_eltex); diff --git a/includes/discovery/sensors/temperature/equallogic.inc.php b/includes/discovery/sensors/temperature/equallogic.inc.php index 1338d4edd4..c52aa8de13 100644 --- a/includes/discovery/sensors/temperature/equallogic.inc.php +++ b/includes/discovery/sensors/temperature/equallogic.inc.php @@ -39,7 +39,7 @@ if (! empty($oids)) { $index = (100 + $index); if ($extra[$keys[0]]['eqlMemberHealthDetailsTemperatureCurrentState'] != 'unknown') { - discover_sensor($valid['sensor'], 'temperature', $device, $oid, $index, 'snmp', $descr, 1, 1, $low_limit, $low_warn, $high_limit, $high_warn, $temperature); + discover_sensor(null, 'temperature', $device, $oid, $index, 'snmp', $descr, 1, 1, $low_limit, $low_warn, $high_limit, $high_warn, $temperature); } }//end if }//end foreach diff --git a/includes/discovery/sensors/temperature/ericsson-ml.inc.php b/includes/discovery/sensors/temperature/ericsson-ml.inc.php index cbfdfcfcc7..ed0fd50709 100644 --- a/includes/discovery/sensors/temperature/ericsson-ml.inc.php +++ b/includes/discovery/sensors/temperature/ericsson-ml.inc.php @@ -19,5 +19,5 @@ $divisor = 1; $temperature = (float) snmp_get($device, $oid, '-Oqv', 'PT-MONITOR-MIB'); if ($temperature != 0.0) { - discover_sensor($valid['sensor'], 'temperature', $device, $oid, $index, $sensor_type, $descr, $divisor, 1, null, null, null, null, $temperature); + discover_sensor(null, 'temperature', $device, $oid, $index, $sensor_type, $descr, $divisor, 1, null, null, null, null, $temperature); } diff --git a/includes/discovery/sensors/temperature/extendair.inc.php b/includes/discovery/sensors/temperature/extendair.inc.php index 72faa0cbe5..e3b6d4d6b2 100644 --- a/includes/discovery/sensors/temperature/extendair.inc.php +++ b/includes/discovery/sensors/temperature/extendair.inc.php @@ -27,7 +27,7 @@ $index = 0; $descr = 'Internal temp (far end radio)'; $value = snmp_get($device, 'remCurrentTemp.0', '-Oqv', 'ExaltComProducts'); if ($value) { - discover_sensor($valid['sensor'], 'temperature', $device, $oid, $index, 'extendair', $descr, '1', '1', null, null, null, null, $value); + discover_sensor(null, 'temperature', $device, $oid, $index, 'extendair', $descr, '1', '1', null, null, null, null, $value); } $oid = '.1.3.6.1.4.1.25651.1.2.4.2.3.1.3.0'; @@ -35,7 +35,7 @@ $index = 1; $descr = 'Internal temp (local radio)'; $value = snmp_get($device, 'locCurrentTemp.0', '-Oqv', 'ExaltComProducts'); if ($value) { - discover_sensor($valid['sensor'], 'temperature', $device, $oid, $index, 'extendair', $descr, '1', '1', null, null, null, null, $value); + discover_sensor(null, 'temperature', $device, $oid, $index, 'extendair', $descr, '1', '1', null, null, null, null, $value); } unset( diff --git a/includes/discovery/sensors/temperature/f5.inc.php b/includes/discovery/sensors/temperature/f5.inc.php index 3eb538566d..0de7e8213b 100644 --- a/includes/discovery/sensors/temperature/f5.inc.php +++ b/includes/discovery/sensors/temperature/f5.inc.php @@ -14,7 +14,7 @@ if (is_array($f5_chassis)) { $sensorType = 'f5'; $oid = '.1.3.6.1.4.1.3375.2.1.3.2.3.2.1.2.' . $index; - discover_sensor($valid['sensor'], 'temperature', $device, $oid, $index, $sensorType, $descr, '1', '1', null, null, null, null, $current); + discover_sensor(null, 'temperature', $device, $oid, $index, $sensorType, $descr, '1', '1', null, null, null, null, $current); } } @@ -33,6 +33,6 @@ if (is_array($f5cpu)) { $sensorType = 'f5'; $oid = '.1.3.6.1.4.1.3375.2.1.3.6.2.1.2.' . $index; - discover_sensor($valid['sensor'], 'temperature', $device, $oid, $index, $sensorType, $descr, '1', '1', null, null, null, null, $current); + discover_sensor(null, 'temperature', $device, $oid, $index, $sensorType, $descr, '1', '1', null, null, null, null, $current); } } diff --git a/includes/discovery/sensors/temperature/ftos.inc.php b/includes/discovery/sensors/temperature/ftos.inc.php index b02694fbe8..3c0ab12b0b 100644 --- a/includes/discovery/sensors/temperature/ftos.inc.php +++ b/includes/discovery/sensors/temperature/ftos.inc.php @@ -13,7 +13,7 @@ if (is_array($oids)) { $descr = 'Unit ' . $index . ' ' . $entry['chStackUnitSysType']; $oid = '.1.3.6.1.4.1.6027.3.10.1.2.2.1.14.' . $index; $current = $entry['chStackUnitTemp']; - discover_sensor($valid['sensor'], 'temperature', $device, $oid, $index, 'ftos-sseries', $descr, '1', '1', null, null, null, null, $current); + discover_sensor(null, 'temperature', $device, $oid, $index, 'ftos-sseries', $descr, '1', '1', null, null, null, null, $current); } } @@ -23,7 +23,7 @@ if (is_array($oids)) { $entry['descr'] = 'Slot ' . $index; $entry['oid'] = '.1.3.6.1.4.1.6027.3.8.1.2.1.1.5.' . $index; $entry['current'] = $entry['chSysCardTemp']; - discover_sensor($valid['sensor'], 'temperature', $device, $entry['oid'], $index, 'ftos-cseries', $entry['descr'], '1', '1', null, null, null, null, $entry['current']); + discover_sensor(null, 'temperature', $device, $entry['oid'], $index, 'ftos-cseries', $entry['descr'], '1', '1', null, null, null, null, $entry['current']); } } @@ -37,6 +37,6 @@ if (is_array($oids)) { $oid = '.1.3.6.1.4.1.6027.3.1.1.2.3.1.8.' . $index; $current = $entry['chSysCardUpperTemp']; - discover_sensor($valid['sensor'], 'temperature', $device, $oid, $index, 'ftos-eseries', $descr, '1', '1', null, null, null, null, $current); + discover_sensor(null, 'temperature', $device, $oid, $index, 'ftos-eseries', $descr, '1', '1', null, null, null, null, $current); } } diff --git a/includes/discovery/sensors/temperature/geist-watchdog.inc.php b/includes/discovery/sensors/temperature/geist-watchdog.inc.php index 5b1a8a0a29..bc8d5533d1 100644 --- a/includes/discovery/sensors/temperature/geist-watchdog.inc.php +++ b/includes/discovery/sensors/temperature/geist-watchdog.inc.php @@ -26,14 +26,14 @@ $value = snmp_get($device, 'climateTempC', '-Oqv', 'GEIST-MIB-V3'); if ($value) { $current_oid = '.1.3.6.1.4.1.21239.2.2.1.5.1'; $descr = 'Temperature'; - discover_sensor($valid['sensor'], 'temperature', $device, $current_oid, 'climateTempC', 'geist-watchdog', $descr, 1, 1, null, null, null, null, $value); + discover_sensor(null, 'temperature', $device, $current_oid, 'climateTempC', 'geist-watchdog', $descr, 1, 1, null, null, null, null, $value); } $value = snmp_get($device, 'climateTempF', '-Oqv', 'GEIST-MIB-V3'); if ($value) { $current_oid = '.1.3.6.1.4.1.21239.2.2.1.6.1'; $descr = 'Temperature'; - discover_sensor($valid['sensor'], 'temperature', $device, $current_oid, 'climateTempF', 'geist-watchdog', $descr, 1, 1, null, null, null, null, $value, null, null, null, 'fahrenheit_to_celsius'); + discover_sensor(null, 'temperature', $device, $current_oid, 'climateTempF', 'geist-watchdog', $descr, 1, 1, null, null, null, null, $value, null, null, null, 'fahrenheit_to_celsius'); } $temp_table = snmpwalk_cache_oid($device, 'tempSensorTable', [], 'GEIST-MIB-V3'); @@ -43,7 +43,7 @@ foreach ($temp_table as $index => $temp_data) { $current_oid = '.1.3.6.1.4.1.21239.2.4.1.5.' . $index; $descr = $temp_data['tempSensorName'] . ': #' . $temp_data['tempSensorSerial']; $value = $temp_data['tempSensorTempC']; - discover_sensor($valid['sensor'], 'temperature', $device, $current_oid, $index, 'geist-watchdog', $descr, 1, 1, null, null, null, null, $value); + discover_sensor(null, 'temperature', $device, $current_oid, $index, 'geist-watchdog', $descr, 1, 1, null, null, null, null, $value); } } diff --git a/includes/discovery/sensors/temperature/hpblmos.inc.php b/includes/discovery/sensors/temperature/hpblmos.inc.php index fed3fda2f1..8f972fc389 100644 --- a/includes/discovery/sensors/temperature/hpblmos.inc.php +++ b/includes/discovery/sensors/temperature/hpblmos.inc.php @@ -16,7 +16,7 @@ foreach (explode("\n", $temps) as $temp) { $current_oid = $sensor_value_oid . $current_id; $value = snmp_get($device, $current_oid, '-Oqve'); if ($value > 0) { - discover_sensor($valid['sensor'], 'temperature', $device, $current_oid, $current_id, $sensor_type, $descr, 1, 1, null, null, null, null, $value); + discover_sensor(null, 'temperature', $device, $current_oid, $current_id, $sensor_type, $descr, 1, 1, null, null, null, null, $value); } } } diff --git a/includes/discovery/sensors/temperature/hytera.inc.php b/includes/discovery/sensors/temperature/hytera.inc.php index 3bf9fcd9cb..13462b7e32 100644 --- a/includes/discovery/sensors/temperature/hytera.inc.php +++ b/includes/discovery/sensors/temperature/hytera.inc.php @@ -18,6 +18,6 @@ foreach (explode("\n", $oids) as $data) { $oid = '.1.3.6.1.4.1.40297.1.2.1.2.2.' . $index; $temperature = hytera_h2f(str_replace('"', '', snmp_get($device, $oid, '-Oqv')), 2); - discover_sensor($valid['sensor'], 'temperature', $device, $oid, $index, $type, $descr, $divisor, '1', 0, 0, 70, 75, $temperature); + discover_sensor(null, 'temperature', $device, $oid, $index, $type, $descr, $divisor, '1', 0, 0, 70, 75, $temperature); } } diff --git a/includes/discovery/sensors/temperature/ibm-amm.inc.php b/includes/discovery/sensors/temperature/ibm-amm.inc.php index 250c0e77de..a7fb5e39e8 100644 --- a/includes/discovery/sensors/temperature/ibm-amm.inc.php +++ b/includes/discovery/sensors/temperature/ibm-amm.inc.php @@ -24,7 +24,7 @@ if (! empty($mmtemp)) { $descr = 'Management module temperature'; $divisor = 1; $current = $mmtemp; - discover_sensor($valid['sensor'], 'temperature', $device, $oid, $oid, 'ibm-amm', $descr, $divisor, '1', null, null, null, null, $current); + discover_sensor(null, 'temperature', $device, $oid, $oid, 'ibm-amm', $descr, $divisor, '1', null, null, null, null, $current); } $oid = '.1.3.6.1.4.1.2.3.51.2.2.1.5.1.0'; // BLADE-MIB::frontPanelTemp.0 @@ -41,5 +41,5 @@ if (! empty($fptemp)) { $descr = 'Front panel temperature'; $divisor = 1; $current = $fptemp; - discover_sensor($valid['sensor'], 'temperature', $device, $oid, $oid, 'ibm-amm', $descr, $divisor, '1', null, null, null, null, $current); + discover_sensor(null, 'temperature', $device, $oid, $oid, 'ibm-amm', $descr, $divisor, '1', null, null, null, null, $current); } diff --git a/includes/discovery/sensors/temperature/ibmnos.inc.php b/includes/discovery/sensors/temperature/ibmnos.inc.php index 0f237a0dbc..30dca42ee8 100644 --- a/includes/discovery/sensors/temperature/ibmnos.inc.php +++ b/includes/discovery/sensors/temperature/ibmnos.inc.php @@ -21,7 +21,7 @@ if (strstr($device['sysDescr'], 'IBM Flex System Fabric')) { $divisor = '1'; $multiplier = '1'; $type = 'ibmnos'; - discover_sensor($valid['sensor'], 'temperature', $device, $obj, $index, $type, $descr, $divisor, $multiplier, null, null, null, null, $current); + discover_sensor(null, 'temperature', $device, $obj, $index, $type, $descr, $divisor, $multiplier, null, null, null, null, $current); } } } diff --git a/includes/discovery/sensors/temperature/ies.inc.php b/includes/discovery/sensors/temperature/ies.inc.php index 607774d15d..0d83cff088 100644 --- a/includes/discovery/sensors/temperature/ies.inc.php +++ b/includes/discovery/sensors/temperature/ies.inc.php @@ -14,6 +14,6 @@ if (is_array($oids)) { $oid = '.1.3.6.1.4.1.890.1.5.1.1.6.1.2.' . $index; $current = $entry['accessSwitchSysTempCurValue']; $divisor = '1'; - discover_sensor($valid['sensor'], 'temperature', $device, $oid, $index, 'zyxel-ies', $descr, '1', '1', null, $entry['accessSwitchSysTempHighThresh'], null, null, $current); + discover_sensor(null, 'temperature', $device, $oid, $index, 'zyxel-ies', $descr, '1', '1', null, $entry['accessSwitchSysTempHighThresh'], null, null, $current); } } diff --git a/includes/discovery/sensors/temperature/ifotec.inc.php b/includes/discovery/sensors/temperature/ifotec.inc.php index b704fde92a..8f4ab19802 100644 --- a/includes/discovery/sensors/temperature/ifotec.inc.php +++ b/includes/discovery/sensors/temperature/ifotec.inc.php @@ -25,7 +25,7 @@ $index = 0; foreach ($pre_cache['ifoTemperatureTable'] as $ifoSensor) { discover_sensor( - $valid['sensor'], + null, 'temperature', $device, $ifoSensor['ifoTempValue']['oid'], diff --git a/includes/discovery/sensors/temperature/ipoman.inc.php b/includes/discovery/sensors/temperature/ipoman.inc.php index b08406fe73..688762ca61 100644 --- a/includes/discovery/sensors/temperature/ipoman.inc.php +++ b/includes/discovery/sensors/temperature/ipoman.inc.php @@ -15,6 +15,6 @@ if ($emd_installed != 'disabled') { $current_oid = '.1.3.6.1.4.1.2468.1.4.2.1.5.1.1.2.0'; $descr = trim(str_replace('"', '', $descr)); - discover_sensor($valid['sensor'], 'temperature', $device, $current_oid, '1', 'ipoman', $descr, '10', '1', $low_limit, null, null, $high_limit, $current); + discover_sensor(null, 'temperature', $device, $current_oid, '1', 'ipoman', $descr, '10', '1', $low_limit, null, null, $high_limit, $current); } } diff --git a/includes/discovery/sensors/temperature/junose.inc.php b/includes/discovery/sensors/temperature/junose.inc.php index 40b7defdc4..718a13a572 100644 --- a/includes/discovery/sensors/temperature/junose.inc.php +++ b/includes/discovery/sensors/temperature/junose.inc.php @@ -13,7 +13,7 @@ if (is_array($oids)) { $oid = '.1.3.6.1.4.1.4874.2.2.2.1.9.4.1.3.' . $index; $current = $entry['juniSystemTempValue']; - discover_sensor($valid['sensor'], 'temperature', $device, $oid, $index, 'junose', $descr, '1', '1', null, null, null, null, $current); + discover_sensor(null, 'temperature', $device, $oid, $index, 'junose', $descr, '1', '1', null, null, null, null, $current); } } } diff --git a/includes/discovery/sensors/temperature/lantronix-slc.inc.php b/includes/discovery/sensors/temperature/lantronix-slc.inc.php index cf3bc6b19c..5e411d7a9d 100644 --- a/includes/discovery/sensors/temperature/lantronix-slc.inc.php +++ b/includes/discovery/sensors/temperature/lantronix-slc.inc.php @@ -26,5 +26,5 @@ $value = trim($value, 'Celsius'); $value = trim($value, ' '); if (is_numeric($value)) { - discover_sensor($valid['sensor'], 'temperature', $device, $valueoid, 1, 'lantronix-slc', $descr, '1', '1', $low_limit, $low_warn_limit, $high_warn_limit, $high_limit, $value); + discover_sensor(null, 'temperature', $device, $valueoid, 1, 'lantronix-slc', $descr, '1', '1', $low_limit, $low_warn_limit, $high_warn_limit, $high_limit, $value); } diff --git a/includes/discovery/sensors/temperature/liebert.inc.php b/includes/discovery/sensors/temperature/liebert.inc.php index c7867d7efb..de46331708 100644 --- a/includes/discovery/sensors/temperature/liebert.inc.php +++ b/includes/discovery/sensors/temperature/liebert.inc.php @@ -42,7 +42,7 @@ foreach ($lib_data as $index => $data) { } if (is_numeric($current)) { $descr = $data['lgpEnvTemperatureDescrDegC']; - discover_sensor($valid['sensor'], 'temperature', $device, $oid, $new_index, 'liebert', $descr, $divisor, 1, $low_limit, null, null, $high_limit, $current / $divisor); + discover_sensor(null, 'temperature', $device, $oid, $new_index, 'liebert', $descr, $divisor, 1, $low_limit, null, null, $high_limit, $current / $divisor); unset($current); } } @@ -64,7 +64,7 @@ if (is_numeric($return_temp)) { $index = 'lgpEnvReturnAirTemperature.0'; $descr = 'Return Air Temp'; $divisor = 1; - discover_sensor($valid['sensor'], 'temperature', $device, $oid, $index, 'liebert', $descr, $divisor, '1', null, null, null, null, $return_temp); + discover_sensor(null, 'temperature', $device, $oid, $index, 'liebert', $descr, $divisor, '1', null, null, null, null, $return_temp); } $supply_temp = snmp_get($device, 'lgpEnvSupplyAirTemperature.0', '-Oqv'); @@ -73,5 +73,5 @@ if (is_numeric($supply_temp)) { $index = 'lgpEnvSupplyAirTemperature.0'; $descr = 'Supply Air Temp'; $divisor = 1; - discover_sensor($valid['sensor'], 'temperature', $device, $oid, $index, 'liebert', $descr, $divisor, '1', null, null, null, null, $supply_temp); + discover_sensor(null, 'temperature', $device, $oid, $index, 'liebert', $descr, $divisor, '1', null, null, null, null, $supply_temp); } diff --git a/includes/discovery/sensors/temperature/linux.inc.php b/includes/discovery/sensors/temperature/linux.inc.php index 2eea6af068..b3aa258c4e 100644 --- a/includes/discovery/sensors/temperature/linux.inc.php +++ b/includes/discovery/sensors/temperature/linux.inc.php @@ -13,7 +13,7 @@ $value = trim($value, '"'); if (is_numeric($value)) { $sensor_type = 'raspberry_temp'; $descr = 'CPU Temp'; - discover_sensor($valid['sensor'], 'temperature', $device, $sensor_oid, 1, $sensor_type, $descr, 1, 1, null, null, null, null, $value); + discover_sensor(null, 'temperature', $device, $sensor_oid, 1, $sensor_type, $descr, 1, 1, null, null, null, null, $value); } if (Str::startsWith($device['sysObjectID'], '.1.3.6.1.4.1.232.')) { @@ -37,7 +37,7 @@ if (Str::startsWith($device['sysObjectID'], '.1.3.6.1.4.1.232.')) { $threshold = snmp_get($device, $threshold_oid, '-Oqv', ''); if (! empty($temperature)) { - discover_sensor($valid['sensor'], 'temperature', $device, $temperature_oid, $oid, 'hpilo', $descr, '1', '1', null, null, null, $threshold, $temperature); + discover_sensor(null, 'temperature', $device, $temperature_oid, $oid, 'hpilo', $descr, '1', '1', null, null, null, $threshold, $temperature); } } } @@ -54,7 +54,7 @@ if (preg_match('/(Linux).+(ntc)/', $device['sysDescr'])) { $index = '116.1'; $value = snmp_get($device, $oid . $index, '-Oqv'); if (is_numeric($value)) { - discover_sensor($valid['sensor'], 'temperature', $device, $oid . $index, $index, $sensor_type, $descr, '1', '1', $lowlimit, $lowwarnlimit, $warnlimit, $limit, $value); + discover_sensor(null, 'temperature', $device, $oid . $index, $index, $sensor_type, $descr, '1', '1', $lowlimit, $lowwarnlimit, $warnlimit, $limit, $value); } } diff --git a/includes/discovery/sensors/temperature/mgeups.inc.php b/includes/discovery/sensors/temperature/mgeups.inc.php index c79d701c42..dd305a368e 100644 --- a/includes/discovery/sensors/temperature/mgeups.inc.php +++ b/includes/discovery/sensors/temperature/mgeups.inc.php @@ -49,5 +49,5 @@ foreach (array_keys($mge_env_data) as $index) { d_echo("low_limit : $low_limit\nlow_warn_limit : $low_warn_limit\nhigh_warn_limit : $high_warn_limit\nhigh_limit : $high_limit\n"); - discover_sensor($valid['sensor'], 'temperature', $device, $oid, $index, $sensorType, $descr, '10', '1', $low_limit, $low_warn_limit, $high_warn_limit, $high_limit, $current / 10); + discover_sensor(null, 'temperature', $device, $oid, $index, $sensorType, $descr, '10', '1', $low_limit, $low_warn_limit, $high_warn_limit, $high_limit, $current / 10); } diff --git a/includes/discovery/sensors/temperature/microsemipdsine.inc.php b/includes/discovery/sensors/temperature/microsemipdsine.inc.php index 595aa7b5a0..fb60a26470 100644 --- a/includes/discovery/sensors/temperature/microsemipdsine.inc.php +++ b/includes/discovery/sensors/temperature/microsemipdsine.inc.php @@ -43,5 +43,5 @@ if (! empty($temperature_unit) && ! empty($temperature)) { $oid = '.1.3.6.1.4.1.7428.1.2.2.1.1.11.1'; $current_value = $temperature / $divisor; - discover_sensor($valid['sensor'], 'temperature', $device, $oid, $index, $type, $descr, $divisor, '1', null, null, null, null, $current_value, 'snmp', null, null, $function); + discover_sensor(null, 'temperature', $device, $oid, $index, $type, $descr, $divisor, '1', null, null, null, null, $current_value, 'snmp', null, null, $function); } diff --git a/includes/discovery/sensors/temperature/mimosa.inc.php b/includes/discovery/sensors/temperature/mimosa.inc.php index c4ab85a48a..d0c134060f 100644 --- a/includes/discovery/sensors/temperature/mimosa.inc.php +++ b/includes/discovery/sensors/temperature/mimosa.inc.php @@ -18,5 +18,5 @@ $descr = 'Internal Temp'; $divisor = 10; $temperature = (snmp_get($device, $oid, '-Oqv') / $divisor); if (is_numeric($temperature)) { - discover_sensor($valid['sensor'], 'temperature', $device, $oid, $index, $sensor_type, $descr, $divisor, '1', '0', null, null, '65', $temperature); + discover_sensor(null, 'temperature', $device, $oid, $index, $sensor_type, $descr, $divisor, '1', '0', null, null, '65', $temperature); } diff --git a/includes/discovery/sensors/temperature/minkelsrms.inc.php b/includes/discovery/sensors/temperature/minkelsrms.inc.php index 42f5288499..9b2394516c 100644 --- a/includes/discovery/sensors/temperature/minkelsrms.inc.php +++ b/includes/discovery/sensors/temperature/minkelsrms.inc.php @@ -30,7 +30,7 @@ foreach (explode("\n", $oids) as $data) { $limit = snmp_get($device, $limit_oid, '-Oqv', ''); $lowlimit = snmp_get($device, $lowlimit_oid, '-Oqv', ''); - discover_sensor($valid['sensor'], 'temperature', $device, $temperature_oid, $temperature_id, 'akcp', $descr, '1', '1', $lowlimit, $low_warn_limit, $warnlimit, $limit, $temperature); + discover_sensor(null, 'temperature', $device, $temperature_oid, $temperature_id, 'akcp', $descr, '1', '1', $lowlimit, $low_warn_limit, $warnlimit, $limit, $temperature); } } } diff --git a/includes/discovery/sensors/temperature/netagent2.inc.php b/includes/discovery/sensors/temperature/netagent2.inc.php index 6703730c51..419d19306d 100644 --- a/includes/discovery/sensors/temperature/netagent2.inc.php +++ b/includes/discovery/sensors/temperature/netagent2.inc.php @@ -37,7 +37,7 @@ if (! empty($ups_temperature) || $ups_temperature == 0) { $descr = 'Temperature'; discover_sensor( - $valid['sensor'], + null, 'temperature', $device, $ups_temperature_oid, diff --git a/includes/discovery/sensors/temperature/netapp.inc.php b/includes/discovery/sensors/temperature/netapp.inc.php index f8dfcf490d..1ec0dfb2ca 100644 --- a/includes/discovery/sensors/temperature/netapp.inc.php +++ b/includes/discovery/sensors/temperature/netapp.inc.php @@ -26,7 +26,7 @@ if ($oids) { $temp_id = $temperature_id . '.' . $x; $descr = 'Temp Sensor'; $x++; - discover_sensor($valid['sensor'], 'temperature', $device, $temperature_oid, $temp_id, 'netapp', $descr, '1', '1', $low_limit, $low_warn_limit, $warn_limit, $high_limit, $temperature); + discover_sensor(null, 'temperature', $device, $temperature_oid, $temp_id, 'netapp', $descr, '1', '1', $low_limit, $low_warn_limit, $warn_limit, $high_limit, $temperature); } } } diff --git a/includes/discovery/sensors/temperature/netonix.inc.php b/includes/discovery/sensors/temperature/netonix.inc.php index b523db1e10..8c389086d2 100644 --- a/includes/discovery/sensors/temperature/netonix.inc.php +++ b/includes/discovery/sensors/temperature/netonix.inc.php @@ -31,7 +31,7 @@ if (is_array($oids)) { $descr = $entry['tempDescription']; $oid = '.1.3.6.1.4.1.46242.3.1.3.' . $index; $current = $entry['temp']; - discover_sensor($valid['sensor'], 'temperature', $device, $oid, $index, $device['os'], $descr, '1', '1', null, null, null, null, $current); + discover_sensor(null, 'temperature', $device, $oid, $index, $device['os'], $descr, '1', '1', null, null, null, null, $current); } } } diff --git a/includes/discovery/sensors/temperature/nokia-isam.inc.php b/includes/discovery/sensors/temperature/nokia-isam.inc.php index 8d424c4c7d..e690d8c9c0 100644 --- a/includes/discovery/sensors/temperature/nokia-isam.inc.php +++ b/includes/discovery/sensors/temperature/nokia-isam.inc.php @@ -13,7 +13,7 @@ foreach ($snmp_data['nokiaIsamSlotTemperature'] as $slotId => $slot) { $limit = $sensor['eqptBoardThermalSensorShutdownThresholdHigh'] / $divisor; $warn_limit = $sensor['eqptBoardThermalSensorTcaThresholdHigh'] / $divisor; $value = $sensor['eqptBoardThermalSensorActualTemperature'] / $divisor; - discover_sensor($valid['sensor'], 'temperature', $device, $oid, $slotName . '.' . $sensorId . '-temp', 'nokia-isam', $descr, $divisor, $multiplier, $limit_low, $warn_limit_low, $warn_limit, $limit, $value, 'snmp', $entPhysicalIndex, $entPhysicalIndex_measured); + discover_sensor(null, 'temperature', $device, $oid, $slotName . '.' . $sensorId . '-temp', 'nokia-isam', $descr, $divisor, $multiplier, $limit_low, $warn_limit_low, $warn_limit, $limit, $value, 'snmp', $entPhysicalIndex, $entPhysicalIndex_measured); } } } diff --git a/includes/discovery/sensors/temperature/nos.inc.php b/includes/discovery/sensors/temperature/nos.inc.php index 1b573b3552..2e0b062df1 100644 --- a/includes/discovery/sensors/temperature/nos.inc.php +++ b/includes/discovery/sensors/temperature/nos.inc.php @@ -26,7 +26,7 @@ foreach (explode("\n", $oids) as $data) { if (! strstr($descr, 'No') and ! strstr($value, 'No')) { $descr = str_replace('"', '', $descr); $descr = trim($descr); - discover_sensor($valid['sensor'], 'temperature', $device, $value_oid, $oididx, 'nos', $descr, '1', '1', null, null, '80', '100', $value); + discover_sensor(null, 'temperature', $device, $value_oid, $oididx, 'nos', $descr, '1', '1', null, null, '80', '100', $value); } } } diff --git a/includes/discovery/sensors/temperature/onefs.inc.php b/includes/discovery/sensors/temperature/onefs.inc.php index 6125ad076d..be09dd12ce 100644 --- a/includes/discovery/sensors/temperature/onefs.inc.php +++ b/includes/discovery/sensors/temperature/onefs.inc.php @@ -30,7 +30,7 @@ foreach ($oids as $index => $entry) { $descr = $entry['tempSensorDescription']; $oid = '.1.3.6.1.4.1.12124.2.54.1.4.' . $index; $current = $entry['tempSensorValue']; - discover_sensor($valid['sensor'], 'temperature', $device, $oid, $index, 'onefs', $descr, '1', '1', null, null, null, null, $current); + discover_sensor(null, 'temperature', $device, $oid, $index, 'onefs', $descr, '1', '1', null, null, null, null, $current); } } diff --git a/includes/discovery/sensors/temperature/papouch-tme.inc.php b/includes/discovery/sensors/temperature/papouch-tme.inc.php index 822a710664..a21132eb05 100644 --- a/includes/discovery/sensors/temperature/papouch-tme.inc.php +++ b/includes/discovery/sensors/temperature/papouch-tme.inc.php @@ -8,5 +8,5 @@ $temperature = (snmp_get($device, 'SNMPv2-SMI::enterprises.18248.1.1.1.0', '-Oqv if ($descr != '' && is_numeric($temperature) && $temperature > '0') { $temperature_oid = '.1.3.6.1.4.1.18248.1.1.1.0'; $descr = trim(str_replace('"', '', $descr)); - discover_sensor($valid['sensor'], 'temperature', $device, $temperature_oid, '1', 'papouch-tme', $descr, '10', '1', null, null, null, null, $temperature); + discover_sensor(null, 'temperature', $device, $temperature_oid, '1', 'papouch-tme', $descr, '10', '1', null, null, null, null, $temperature); } diff --git a/includes/discovery/sensors/temperature/pbn.inc.php b/includes/discovery/sensors/temperature/pbn.inc.php index d62f2be00d..8d707668b1 100644 --- a/includes/discovery/sensors/temperature/pbn.inc.php +++ b/includes/discovery/sensors/temperature/pbn.inc.php @@ -26,6 +26,6 @@ foreach ($pre_cache['pbn_oids'] as $index => $entry) { $value = $entry['temperature'] / $divisor; $entPhysicalIndex = $index; $entPhysicalIndex_measured = 'ports'; - discover_sensor($valid['sensor'], 'temperature', $device, $oid, '' . $index, 'pbn', $descr, $divisor, $multiplier, $limit_low, $warn_limit_low, $warn_limit, $limit, $value, 'snmp', $entPhysicalIndex, $entPhysicalIndex_measured); + discover_sensor(null, 'temperature', $device, $oid, '' . $index, 'pbn', $descr, $divisor, $multiplier, $limit_low, $warn_limit_low, $warn_limit, $limit, $value, 'snmp', $entPhysicalIndex, $entPhysicalIndex_measured); } } diff --git a/includes/discovery/sensors/temperature/pcoweb.inc.php b/includes/discovery/sensors/temperature/pcoweb.inc.php index c9bc11a293..9c9175b006 100644 --- a/includes/discovery/sensors/temperature/pcoweb.inc.php +++ b/includes/discovery/sensors/temperature/pcoweb.inc.php @@ -121,6 +121,6 @@ foreach ($temperatures as $temperature) { if (is_numeric($current) && $current != 0) { $index = implode('.', array_slice(explode('.', $temperature['oid']), -5)); - discover_sensor($valid['sensor'], 'temperature', $device, $temperature['oid'], $index, 'pcoweb', $temperature['descr'], $temperature['precision'], '1', $low_limit, null, null, $high_limit, $current); + discover_sensor(null, 'temperature', $device, $temperature['oid'], $index, 'pcoweb', $temperature['descr'], $temperature['precision'], '1', $low_limit, null, null, $high_limit, $current); } } diff --git a/includes/discovery/sensors/temperature/powerconnect.inc.php b/includes/discovery/sensors/temperature/powerconnect.inc.php index 8667d4673e..fa6358c011 100644 --- a/includes/discovery/sensors/temperature/powerconnect.inc.php +++ b/includes/discovery/sensors/temperature/powerconnect.inc.php @@ -9,7 +9,7 @@ switch ($device['sysObjectID']) { case '.1.3.6.1.4.1.674.10895.3019': /* Dell Powerconnect 3548P */ case '.1.3.6.1.4.1.674.10895.3028': /* Dell Powerconnect 2848 */ $temperature = trim(snmp_get($device, '.1.3.6.1.4.1.89.53.15.1.9.1', '-Ovq')); - discover_sensor($valid['sensor'], 'temperature', $device, '.1.3.6.1.4.1.89.53.15.1.9.1', 0, 'powerconnect', 'Internal Temperature', '1', '1', '0', null, null, '45', $temperature); + discover_sensor(null, 'temperature', $device, '.1.3.6.1.4.1.89.53.15.1.9.1', 0, 'powerconnect', 'Internal Temperature', '1', '1', '0', null, null, '45', $temperature); break; default: /** @@ -18,7 +18,7 @@ switch ($device['sysObjectID']) { */ $temperature = snmp_get($device, 'boxServicesTempSensorTemperature.0', '-Ovq', 'FASTPATH-BOXSERVICES-PRIVATE-MIB'); if (is_numeric($temperature)) { - discover_sensor($valid['sensor'], 'temperature', $device, '.1.3.6.1.4.1.674.10895.5000.2.6132.1.1.43.1.8.1.4.0', 0, 'powerconnect', 'Internal Temperature', '1', '1', '0', null, null, '45', $temperature); + discover_sensor(null, 'temperature', $device, '.1.3.6.1.4.1.674.10895.5000.2.6132.1.1.43.1.8.1.4.0', 0, 'powerconnect', 'Internal Temperature', '1', '1', '0', null, null, '45', $temperature); } } @@ -35,7 +35,7 @@ foreach (explode("\n", $temps) as $i => $t) { if (substr($oid, -1) == '1') { // This code will only pull CPU temp for each stack member, but there is no reason why the additional values couldn't be graphed $counter = $counter + 1; - discover_sensor($valid['sensor'], 'temperature', $device, $oid, $counter, 'dnos', 'Unit ' . $counter . ' CPU temperature', '1', '1', null, null, null, null, $val); + discover_sensor(null, 'temperature', $device, $oid, $counter, 'dnos', 'Unit ' . $counter . ' CPU temperature', '1', '1', null, null, null, null, $val); } } @@ -52,6 +52,6 @@ if (is_array($oids)) { $descr = 'Unit ' . $index . ' ' . $entry['chStackUnitSysType']; $oid = '.1.3.6.1.4.1.6027.3.10.1.2.2.1.14.' . $index; $current = $entry['chStackUnitTemp']; - discover_sensor($valid['sensor'], 'temperature', $device, $oid, $index, 'ftos-sseries', $descr, '1', '1', null, null, null, null, $current); + discover_sensor(null, 'temperature', $device, $oid, $index, 'ftos-sseries', $descr, '1', '1', null, null, null, null, $current); } } diff --git a/includes/discovery/sensors/temperature/procurve.inc.php b/includes/discovery/sensors/temperature/procurve.inc.php index 71bf246a98..9e4087714a 100644 --- a/includes/discovery/sensors/temperature/procurve.inc.php +++ b/includes/discovery/sensors/temperature/procurve.inc.php @@ -12,7 +12,7 @@ if (! empty($entphydata)) { if ($index['entPhysicalIndex'] == $tempindex && $value['hpicfXcvrTemp'] != 0) { $cur_oid = '.1.3.6.1.4.1.11.2.14.11.5.1.82.1.1.1.'; discover_sensor( - $valid['sensor'], + null, 'temperature', $device, $cur_oid . $tempindex, @@ -50,7 +50,7 @@ foreach ($pre_cache['procurve_hpicfXcvrInfoTable'] as $index => $entry) { $entPhysicalIndex_measured = 'ports'; foreach ($dbquery as $dbindex => $dbresult) { $descr = makeshortif($dbresult['ifDescr']) . ' Port'; - discover_sensor($valid['sensor'], 'temperature', $device, $oid, 'temp-trans-' . $index, 'procurve', $descr, $divisor, $multiplier, $limit_low, $warn_limit_low, $warn_limit, $limit, $current, 'snmp', $entPhysicalIndex, $entPhysicalIndex_measured); + discover_sensor(null, 'temperature', $device, $oid, 'temp-trans-' . $index, 'procurve', $descr, $divisor, $multiplier, $limit_low, $warn_limit_low, $warn_limit, $limit, $current, 'snmp', $entPhysicalIndex, $entPhysicalIndex_measured); } } } diff --git a/includes/discovery/sensors/temperature/quanta.inc.php b/includes/discovery/sensors/temperature/quanta.inc.php index 25e901c97a..fd7371f925 100644 --- a/includes/discovery/sensors/temperature/quanta.inc.php +++ b/includes/discovery/sensors/temperature/quanta.inc.php @@ -21,6 +21,6 @@ foreach ($sensors_values as $index => $entry) { $descr = "Temperature $index:"; if ($current_value > 0) { - discover_sensor($valid['sensor'], 'temperature', $device, "$numeric_oid_base.$index", $index, $sensor_type, $descr, 1, 1, null, null, null, null, $current_value); + discover_sensor(null, 'temperature', $device, "$numeric_oid_base.$index", $index, $sensor_type, $descr, 1, 1, null, null, null, null, $current_value); } } diff --git a/includes/discovery/sensors/temperature/raisecom-ros.inc.php b/includes/discovery/sensors/temperature/raisecom-ros.inc.php index 7e41413109..d25994a635 100644 --- a/includes/discovery/sensors/temperature/raisecom-ros.inc.php +++ b/includes/discovery/sensors/temperature/raisecom-ros.inc.php @@ -18,7 +18,7 @@ foreach ($pre_cache['rosMgmtOpticalTransceiverDDMTable'] as $index => $data) { $current = $value['rosMgmtOpticalTransceiverParameterValue'] / $divisor; $entPhysicalIndex = $index; $entPhysicalIndex_measured = 'ports'; - discover_sensor($valid['sensor'], 'temperature', $device, $oid, 'tx-' . $index, $sensor_type, $descr, $divisor, $multiplier, $low_limit, $low_warn_limit, $warn_limit, $high_limit, $current, 'snmp', $entPhysicalIndex, $entPhysicalIndex_measured); + discover_sensor(null, 'temperature', $device, $oid, 'tx-' . $index, $sensor_type, $descr, $divisor, $multiplier, $low_limit, $low_warn_limit, $warn_limit, $high_limit, $current, 'snmp', $entPhysicalIndex, $entPhysicalIndex_measured); } } } diff --git a/includes/discovery/sensors/temperature/raisecom.inc.php b/includes/discovery/sensors/temperature/raisecom.inc.php index 632f8c654a..f08878fbfb 100644 --- a/includes/discovery/sensors/temperature/raisecom.inc.php +++ b/includes/discovery/sensors/temperature/raisecom.inc.php @@ -18,7 +18,7 @@ foreach ($pre_cache['raisecomOpticalTransceiverDDMTable'] as $index => $data) { $current = $value['raisecomOpticalTransceiverParameterValue'] / $divisor; $entPhysicalIndex = $index; $entPhysicalIndex_measured = 'ports'; - discover_sensor($valid['sensor'], 'temperature', $device, $oid, 'tx-' . $index, $sensor_type, $descr, $divisor, $multiplier, $low_limit, $low_warn_limit, $warn_limit, $high_limit, $current, 'snmp', $entPhysicalIndex, $entPhysicalIndex_measured); + discover_sensor(null, 'temperature', $device, $oid, 'tx-' . $index, $sensor_type, $descr, $divisor, $multiplier, $low_limit, $low_warn_limit, $warn_limit, $high_limit, $current, 'snmp', $entPhysicalIndex, $entPhysicalIndex_measured); } } } @@ -29,5 +29,5 @@ $low_limit = snmp_get($device, 'raisecomTemperatureThresholdLow.0', ['-OUvq', '- $high_limit = snmp_get($device, 'raisecomTemperatureThresholdHigh.0', ['-OUvq', '-Pu'], 'RAISECOM-SYSTEM-MIB', 'raisecom'); if (is_numeric($value)) { - discover_sensor($valid['sensor'], 'temperature', $device, $oid, 0, 'raisecomTemperatureValue', $descr, '1', '1', $low_limit, $low_warn_limit, $warn_limit, $high_limit, $value); + discover_sensor(null, 'temperature', $device, $oid, 0, 'raisecomTemperatureValue', $descr, '1', '1', $low_limit, $low_warn_limit, $warn_limit, $high_limit, $value); } diff --git a/includes/discovery/sensors/temperature/raritan-pdu.inc.php b/includes/discovery/sensors/temperature/raritan-pdu.inc.php index 93d7653136..192e277ad3 100644 --- a/includes/discovery/sensors/temperature/raritan-pdu.inc.php +++ b/includes/discovery/sensors/temperature/raritan-pdu.inc.php @@ -33,7 +33,7 @@ if (is_array($raritan_data) && ! empty($raritan_data)) { $warn_limit = $raritan_data['unitTempUpperWarning.0']; $high_limit = $raritan_data['unitTempUpperCritical.0']; $current = $raritan_data['unitCpuTemp.0'] / $divisor; - discover_sensor($valid['sensor'], 'temperature', $device, $oid, $tmp_index, 'raritan', $descr, $divisor, 1, $low_limit, $low_limit, $warn_limit, $high_limit, $current); + discover_sensor(null, 'temperature', $device, $oid, $tmp_index, 'raritan', $descr, $divisor, 1, $low_limit, $low_limit, $warn_limit, $high_limit, $current); } else { $multiplier = '1'; foreach ($pre_cache['raritan_extSensorConfig'] as $index => $data) { @@ -59,7 +59,7 @@ if (is_array($raritan_data) && ! empty($raritan_data)) { $user_func = 'fahrenheit_to_celsius'; } if (is_numeric($current) && $current >= 0 && $sensor_available === 'true') { - discover_sensor($valid['sensor'], 'temperature', $device, $oid, 'measurementsExternalSensorValue.' . $index, 'raritan', $descr, $divisor, $multiplier, $low_limit, $low_warn_limit, $high_warn_limit, $high_limit, $current, 'snmp', null, null, $user_func); + discover_sensor(null, 'temperature', $device, $oid, 'measurementsExternalSensorValue.' . $index, 'raritan', $descr, $divisor, $multiplier, $low_limit, $low_warn_limit, $high_warn_limit, $high_limit, $current, 'snmp', null, null, $user_func); } } } @@ -80,7 +80,7 @@ foreach ($oids as $index => $sensor) { $limit_low_warn = $sensor['externalSensorLowerCriticalThreshold'] / $divisor; $offset++; if (is_numeric($temp_current) && $temp_current >= 0) { - discover_sensor($valid['sensor'], 'temperature', $device, $oid, $offset, 'raritan', $descr, $divisor, 1, $limit_low, $limit_low_warn, $limit_high_warn, $limit_high, $temp_current); + discover_sensor(null, 'temperature', $device, $oid, $offset, 'raritan', $descr, $divisor, 1, $limit_low, $limit_low_warn, $limit_high_warn, $limit_high, $temp_current); } } } diff --git a/includes/discovery/sensors/temperature/rfc1628.inc.php b/includes/discovery/sensors/temperature/rfc1628.inc.php index 7e69a09373..e8705a5863 100644 --- a/includes/discovery/sensors/temperature/rfc1628.inc.php +++ b/includes/discovery/sensors/temperature/rfc1628.inc.php @@ -5,7 +5,7 @@ echo 'RFC1628 '; $battery_temp = snmp_get($device, 'upsBatteryTemperature.0', '-OqvU', 'UPS-MIB'); if (is_numeric($battery_temp)) { discover_sensor( - $valid['sensor'], + null, 'temperature', $device, '.1.3.6.1.2.1.33.1.2.7.0', diff --git a/includes/discovery/sensors/temperature/saf.inc.php b/includes/discovery/sensors/temperature/saf.inc.php index 4eedfafad9..22ddcc9565 100644 --- a/includes/discovery/sensors/temperature/saf.inc.php +++ b/includes/discovery/sensors/temperature/saf.inc.php @@ -14,5 +14,5 @@ if (! empty($oids)) { [,$current] = explode(' ', $oids); $index = $oid; $descr = 'System Temp'; - discover_sensor($valid['sensor'], 'temperature', $device, $oid, $index, $type, $descr, $divisor, '1', null, null, null, null, $current); + discover_sensor(null, 'temperature', $device, $oid, $index, $type, $descr, $divisor, '1', null, null, null, null, $current); } diff --git a/includes/discovery/sensors/temperature/sentry3.inc.php b/includes/discovery/sensors/temperature/sentry3.inc.php index 2f83dbfad2..3aa946f6a8 100644 --- a/includes/discovery/sensors/temperature/sentry3.inc.php +++ b/includes/discovery/sensors/temperature/sentry3.inc.php @@ -26,7 +26,7 @@ if ($oids) { } if (is_numeric($current) && $current >= 0) { - discover_sensor($valid['sensor'], 'temperature', $device, $temperature_oid, 'tempHumidSensorTempValue' . $sensor_index, 'sentry3', $descr, $divisor, $multiplier, $low_limit, $low_warn_limit, $high_warn_limit, $high_limit, $current, 'snmp', null, null, $user_func); + discover_sensor(null, 'temperature', $device, $temperature_oid, 'tempHumidSensorTempValue' . $sensor_index, 'sentry3', $descr, $divisor, $multiplier, $low_limit, $low_warn_limit, $high_warn_limit, $high_limit, $current, 'snmp', null, null, $user_func); } } } diff --git a/includes/discovery/sensors/temperature/sentry4.inc.php b/includes/discovery/sensors/temperature/sentry4.inc.php index 8c3f074124..62fb5554c0 100644 --- a/includes/discovery/sensors/temperature/sentry4.inc.php +++ b/includes/discovery/sensors/temperature/sentry4.inc.php @@ -38,6 +38,6 @@ foreach ($pre_cache['sentry4_temp'] as $index => $data) { $user_func = 'fahrenheit_to_celsius'; } if (is_numeric($current) && $current >= 0) { - discover_sensor($valid['sensor'], 'temperature', $device, $oid, 'st4TempSensorValue' . $index, 'sentry4', $descr, $divisor, $multiplier, $low_limit, $low_warn_limit, $high_warn_limit, $high_limit, $current, 'snmp', null, null, $user_func); + discover_sensor(null, 'temperature', $device, $oid, 'st4TempSensorValue' . $index, 'sentry4', $descr, $divisor, $multiplier, $low_limit, $low_warn_limit, $high_warn_limit, $high_limit, $current, 'snmp', null, null, $user_func); } } diff --git a/includes/discovery/sensors/temperature/seos.inc.php b/includes/discovery/sensors/temperature/seos.inc.php index b5867c3b86..185897aa8a 100644 --- a/includes/discovery/sensors/temperature/seos.inc.php +++ b/includes/discovery/sensors/temperature/seos.inc.php @@ -17,7 +17,7 @@ foreach (explode("\n", $oids) as $data) { $temperature = snmp_get($device, $oid, '-Oqv'); $descr = str_replace('"', '', $descr); - discover_sensor($valid['sensor'], 'temperature', $device, $oid, $insert_index, $type, $descr, 1, '1', null, null, null, null, $temperature); + discover_sensor(null, 'temperature', $device, $oid, $insert_index, $type, $descr, 1, '1', null, null, null, null, $temperature); $insert_index++; } } @@ -34,7 +34,7 @@ foreach (explode("\n", $oids) as $data) { $temperature = snmp_get($device, $oid, '-Oqv'); $descr = str_replace('"', '', $descr); - discover_sensor($valid['sensor'], 'temperature', $device, $oid, $insert_index, $type, $descr, 1, '1', null, null, null, null, $temperature); + discover_sensor(null, 'temperature', $device, $oid, $insert_index, $type, $descr, 1, '1', null, null, null, null, $temperature); $insert_index++; } } diff --git a/includes/discovery/sensors/temperature/serveriron.inc.php b/includes/discovery/sensors/temperature/serveriron.inc.php index e5f52b7a6d..1f03c320c7 100644 --- a/includes/discovery/sensors/temperature/serveriron.inc.php +++ b/includes/discovery/sensors/temperature/serveriron.inc.php @@ -24,5 +24,5 @@ if (is_numeric($value_high)) { if (is_numeric($value)) { $current = ($value / 2); - discover_sensor($valid['sensor'], 'temperature', $device, $oid, 1, 'serveriron-temp', $descr, '2', '1', null, null, $high_warn_limit, $high_limit, $current); + discover_sensor(null, 'temperature', $device, $oid, 1, 'serveriron-temp', $descr, '2', '1', null, null, $high_warn_limit, $high_limit, $current); } diff --git a/includes/discovery/sensors/temperature/serverscheck.inc.php b/includes/discovery/sensors/temperature/serverscheck.inc.php index b678ded0c9..01b8d7d9b7 100644 --- a/includes/discovery/sensors/temperature/serverscheck.inc.php +++ b/includes/discovery/sensors/temperature/serverscheck.inc.php @@ -42,7 +42,7 @@ foreach ($pre_cache['serverscheck_control'] as $oid_name => $oid_value) { if (is_numeric($current)) { $index = str_replace('.0', '', $oid_name); $descr = $oid_value; - discover_sensor($valid['sensor'], 'temperature', $device, $serverscheck_oids[$tmp_oid], $index, 'serverscheck', $descr, 1, 1, null, null, null, null, $current); + discover_sensor(null, 'temperature', $device, $serverscheck_oids[$tmp_oid], $index, 'serverscheck', $descr, 1, 1, null, null, null, null, $current); } } $temp_x++; diff --git a/includes/discovery/sensors/temperature/sgos.inc.php b/includes/discovery/sensors/temperature/sgos.inc.php index 8d40065b63..72bcff04be 100644 --- a/includes/discovery/sensors/temperature/sgos.inc.php +++ b/includes/discovery/sensors/temperature/sgos.inc.php @@ -11,7 +11,7 @@ for ($index = 1; $index < 20; $index++) { //Proxy SG Temp OID end in 1-20 $descr = snmp_get($device, $descr_oid, '-Oqv', 'BLUECOAT-SG-SENSOR-MIB'); $current = snmp_get($device, $temp_oid, '-Oqv', 'BLUECOAT-SG-SENSOR-MIB'); $divisor = '1'; - discover_sensor($valid['sensor'], 'temperature', $device, $temp_oid, $temp_index, 'sgos', $descr, 1, '1', null, null, null, null, $current); + discover_sensor(null, 'temperature', $device, $temp_oid, $temp_index, 'sgos', $descr, 1, '1', null, null, null, null, $current); } $temp_index++; } diff --git a/includes/discovery/sensors/temperature/siklu.inc.php b/includes/discovery/sensors/temperature/siklu.inc.php index 14d80b0535..7201830d39 100644 --- a/includes/discovery/sensors/temperature/siklu.inc.php +++ b/includes/discovery/sensors/temperature/siklu.inc.php @@ -14,5 +14,5 @@ if (! empty($oids)) { [,$current] = explode(' ', $oids); $index = $oid; $descr = 'System Temp'; - discover_sensor($valid['sensor'], 'temperature', $device, $oid, $index, $type, $descr, $divisor, '1', null, null, null, null, $current); + discover_sensor(null, 'temperature', $device, $oid, $index, $type, $descr, $divisor, '1', null, null, null, null, $current); } diff --git a/includes/discovery/sensors/temperature/sitemonitor.inc.php b/includes/discovery/sensors/temperature/sitemonitor.inc.php index 433a32d821..91b96db277 100644 --- a/includes/discovery/sensors/temperature/sitemonitor.inc.php +++ b/includes/discovery/sensors/temperature/sitemonitor.inc.php @@ -24,12 +24,12 @@ */ $oid = '.1.3.6.1.4.1.32050.2.1.27.5.0'; $current = (snmp_get($device, $oid, '-Oqv') / 10); -discover_sensor($valid['sensor'], 'temperature', $device, $oid, 0, 'sitemonitor', 'Temperature', 10, 1, null, null, null, null, $current); +discover_sensor(null, 'temperature', $device, $oid, 0, 'sitemonitor', 'Temperature', 10, 1, null, null, null, null, $current); $oid = '.1.3.6.1.4.1.32050.2.1.27.5.5'; $current = (snmp_get($device, $oid, '-Oqv') / 10); -discover_sensor($valid['sensor'], 'temperature', $device, $oid, 5, 'sitemonitor', 'Relay on Above', 10, 1, null, null, null, null, $current); +discover_sensor(null, 'temperature', $device, $oid, 5, 'sitemonitor', 'Relay on Above', 10, 1, null, null, null, null, $current); $oid = '.1.3.6.1.4.1.32050.2.1.27.5.6'; $current = (snmp_get($device, $oid, '-Oqv') / 10); -discover_sensor($valid['sensor'], 'temperature', $device, $oid, 6, 'sitemonitor', 'Relay on Below', 10, 1, null, null, null, null, $current); +discover_sensor(null, 'temperature', $device, $oid, 6, 'sitemonitor', 'Relay on Below', 10, 1, null, null, null, null, $current); diff --git a/includes/discovery/sensors/temperature/smartax.inc.php b/includes/discovery/sensors/temperature/smartax.inc.php index 6398493194..06fd4a9548 100644 --- a/includes/discovery/sensors/temperature/smartax.inc.php +++ b/includes/discovery/sensors/temperature/smartax.inc.php @@ -36,6 +36,6 @@ foreach ($data as $index => $value) { $tempCurr = $value; $temperature_oid = '.' . $temp_oid . '.' . $index; $descr = $descr_data[$index]; - discover_sensor($valid['sensor'], 'temperature', $device, $temperature_oid, $index, 'smartax', $descr, '1', '1', null, null, null, null, $tempCurr); + discover_sensor(null, 'temperature', $device, $temperature_oid, $index, 'smartax', $descr, '1', '1', null, null, null, null, $tempCurr); } } diff --git a/includes/discovery/sensors/temperature/sub10.inc.php b/includes/discovery/sensors/temperature/sub10.inc.php index 726e5dd296..24fda69088 100644 --- a/includes/discovery/sensors/temperature/sub10.inc.php +++ b/includes/discovery/sensors/temperature/sub10.inc.php @@ -25,4 +25,4 @@ foreach (explode("\n", $threshes) as $thresh) { } // Create Sensor -discover_sensor($valid['sensor'], 'temperature', $device, $oid, $oid, 'sub10', 'Modem', '1', '1', $thresholds[$indexes['low']], null, null, $thresholds[$indexes['high']], $current); +discover_sensor(null, 'temperature', $device, $oid, $oid, 'sub10', 'Modem', '1', '1', $thresholds[$indexes['low']], null, null, $thresholds[$indexes['high']], $current); diff --git a/includes/discovery/sensors/temperature/supermicro.inc.php b/includes/discovery/sensors/temperature/supermicro.inc.php index 500742b117..f281529550 100644 --- a/includes/discovery/sensors/temperature/supermicro.inc.php +++ b/includes/discovery/sensors/temperature/supermicro.inc.php @@ -24,7 +24,7 @@ if ($oids) { $monitor = snmp_get($device, $monitor_oid, '-Oqv', 'SUPERMICRO-HEALTH-MIB', 'supermicro'); if ($monitor == 'true') { $descr = trim(str_ireplace('temperature', '', $descr)); - discover_sensor($valid['sensor'], 'temperature', $device, $temperature_oid, trim($index, '.'), 'supermicro', $descr, (int) $divisor, '1', null, null, null, $limit, $temperature); + discover_sensor(null, 'temperature', $device, $temperature_oid, trim($index, '.'), 'supermicro', $descr, (int) $divisor, '1', null, null, null, $limit, $temperature); } } } diff --git a/includes/discovery/sensors/temperature/terra.inc.php b/includes/discovery/sensors/temperature/terra.inc.php index 77420af840..a9aad5aa9a 100644 --- a/includes/discovery/sensors/temperature/terra.inc.php +++ b/includes/discovery/sensors/temperature/terra.inc.php @@ -10,7 +10,7 @@ if ($device['os'] === 'terra') { if (strpos($device['sysDescr'], $row[0]) !== false) { $temperature = snmp_get($device, $row[1], '-Oqv'); if (is_numeric($temperature)) { - discover_sensor($valid['sensor'], 'temperature', $device, $row[1], '0', $row[0], 'Internal Temperature', 1, 1, null, null, null, null, $temperature); + discover_sensor(null, 'temperature', $device, $row[1], '0', $row[0], 'Internal Temperature', 1, 1, null, null, null, null, $temperature); } } } diff --git a/includes/discovery/sensors/temperature/tpdin.inc.php b/includes/discovery/sensors/temperature/tpdin.inc.php index 41302bb8bf..e8269117e1 100644 --- a/includes/discovery/sensors/temperature/tpdin.inc.php +++ b/includes/discovery/sensors/temperature/tpdin.inc.php @@ -39,7 +39,7 @@ $tpdin_oids = [ foreach ($tpdin_oids as $data) { if ($data['current'] > 0) { - discover_sensor($valid['sensor'], 'temperature', $device, $data['oid'], $data['index'], $device['os'], $data['descr'], 10, '1', null, null, null, null, $data['current']); + discover_sensor(null, 'temperature', $device, $data['oid'], $data['index'], $device['os'], $data['descr'], 10, '1', null, null, null, null, $data['current']); } } diff --git a/includes/discovery/sensors/temperature/unix.inc.php b/includes/discovery/sensors/temperature/unix.inc.php index 6058260d4e..029c0a96d7 100644 --- a/includes/discovery/sensors/temperature/unix.inc.php +++ b/includes/discovery/sensors/temperature/unix.inc.php @@ -34,7 +34,7 @@ if (! empty($snmpData)) { $value = intval($lmData[$type . 'Value']) / $divisor; if (! empty($descr)) { $oid = Oid::toNumeric('LM-SENSORS-MIB::' . $type . 'Value.' . $index); - discover_sensor($valid['sensor'], 'temperature', $device, $oid, $index, 'lmsensors', $descr, $divisor, 1, null, null, null, null, $value, 'snmp', null, null, null, 'lmsensors'); + discover_sensor(null, 'temperature', $device, $oid, $index, 'lmsensors', $descr, $divisor, 1, null, null, null, null, $value, 'snmp', null, null, null, 'lmsensors'); } } } @@ -52,7 +52,7 @@ if (! empty($snmpData)) { if (! empty($value)) { $oid = Oid::toNumeric('NET-SNMP-EXTEND-MIB::nsExtendOutLine."ups-nut".' . $index); discover_sensor( - $valid['sensor'], + null, 'temperature', $device, $oid, diff --git a/includes/discovery/sensors/temperature/voss.inc.php b/includes/discovery/sensors/temperature/voss.inc.php index 2fb60fa0b7..4269ed6cb8 100644 --- a/includes/discovery/sensors/temperature/voss.inc.php +++ b/includes/discovery/sensors/temperature/voss.inc.php @@ -19,7 +19,7 @@ if (is_array($rcChasFan)) { $value = $rcChasFan[$index]['rcChasFanAmbientTemperature']; $var1 = 'rcChasFanAmbientTemperature'; $oid = '.1.3.6.1.4.1.2272.1.4.7.1.1.3.' . $index; - discover_sensor($valid['sensor'], 'temperature', $device, $oid, "$var1.$index", 'avaya-vsp', $descr, '1', '1', null, null, null, null, $value); + discover_sensor(null, 'temperature', $device, $oid, "$var1.$index", 'avaya-vsp', $descr, '1', '1', null, null, null, null, $value); } } @@ -30,7 +30,7 @@ $oid = '.1.3.6.1.4.1.2272.1.212.1.0'; $descr = 'VOSS CPU temperature'; $value = snmp_get($device, $index, '-OvqU', 'RAPID-CITY'); if (is_numeric($value) && $value != 0) { - discover_sensor($valid['sensor'], 'temperature', $device, $oid, $index, 'avaya-vsp', $descr, '1', '1', null, null, null, null, $value); + discover_sensor(null, 'temperature', $device, $oid, $index, 'avaya-vsp', $descr, '1', '1', null, null, null, null, $value); } $index = 'rcSingleCpSystemMacTemperature.0'; @@ -38,7 +38,7 @@ $oid = '.1.3.6.1.4.1.2272.1.212.2.0'; $descr = 'VOSS MAC temperature'; $value = snmp_get($device, $index, '-OvqU', 'RAPID-CITY'); if (is_numeric($value) && $value != 0) { - discover_sensor($valid['sensor'], 'temperature', $device, $oid, $index, 'avaya-vsp', $descr, '1', '1', null, null, null, null, $value); + discover_sensor(null, 'temperature', $device, $oid, $index, 'avaya-vsp', $descr, '1', '1', null, null, null, null, $value); } $index = 'rcSingleCpSystemPhy1Temperature.0'; @@ -46,7 +46,7 @@ $oid = '.1.3.6.1.4.1.2272.1.212.3.0'; $descr = 'VOSS PHY1 temperature'; $value = snmp_get($device, $index, '-OvqU', 'RAPID-CITY'); if (is_numeric($value) && $value != 0) { - discover_sensor($valid['sensor'], 'temperature', $device, $oid, $index, 'avaya-vsp', $descr, '1', '1', null, null, null, null, $value); + discover_sensor(null, 'temperature', $device, $oid, $index, 'avaya-vsp', $descr, '1', '1', null, null, null, null, $value); } $index = 'rcSingleCpSystemPhy2Temperature.0'; @@ -55,7 +55,7 @@ $descr = 'VOSS PHY2 temperature'; $value = snmp_get($device, $index, '-OvqU', 'RAPID-CITY'); d_echo("VOSS $var1: $value\n"); if (is_numeric($value) && $value != 0) { - discover_sensor($valid['sensor'], 'temperature', $device, $oid, $index, 'avaya-vsp', $descr, '1', '1', null, null, null, null, $value); + discover_sensor(null, 'temperature', $device, $oid, $index, 'avaya-vsp', $descr, '1', '1', null, null, null, null, $value); } $index = 'rcSingleCpSystemMac2Temperature.0'; @@ -64,5 +64,5 @@ $descr = 'VOSS MAC2 temperature'; $value = snmp_get($device, $index, '-OvqU', 'RAPID-CITY'); d_echo("VOSS $var1: $value\n"); if (is_numeric($value) && $value != 0) { - discover_sensor($valid['sensor'], 'temperature', $device, $oid, $index, 'avaya-vsp', $descr, '1', '1', null, null, null, null, $value); + discover_sensor(null, 'temperature', $device, $oid, $index, 'avaya-vsp', $descr, '1', '1', null, null, null, null, $value); } diff --git a/includes/discovery/sensors/temperature/webmon.inc.php b/includes/discovery/sensors/temperature/webmon.inc.php index ccd3265b6c..1c2a0cfff0 100644 --- a/includes/discovery/sensors/temperature/webmon.inc.php +++ b/includes/discovery/sensors/temperature/webmon.inc.php @@ -48,7 +48,7 @@ foreach ($prefixes as $prefix => $numOidPrefix) { $highLimit = fahrenheit_to_celsius($highLimit); $highWarnLimit = fahrenheit_to_celsius($highWarnLimit); } - discover_sensor($valid['sensor'], 'temperature', $device, $num_oid, $prefix . 'LiveRaw.' . $index, 'webmon', $descr, '1', '1', $lowLimit, $lowWarnLimit, $highWarnLimit, $highLimit, $value, 'snmp', null, null, $user_function, $group); + discover_sensor(null, 'temperature', $device, $num_oid, $prefix . 'LiveRaw.' . $index, 'webmon', $descr, '1', '1', $lowLimit, $lowWarnLimit, $highWarnLimit, $highLimit, $value, 'snmp', null, null, $user_function, $group); } } } diff --git a/includes/discovery/sensors/temperature/websensor.inc.php b/includes/discovery/sensors/temperature/websensor.inc.php index 1529975a9f..344b142f05 100644 --- a/includes/discovery/sensors/temperature/websensor.inc.php +++ b/includes/discovery/sensors/temperature/websensor.inc.php @@ -45,7 +45,7 @@ if ($oids) { $limit = trim($sensor['limit_high'], ' "'); $temperature = $sensor['temp_intval']; - discover_sensor($valid['sensor'], 'temperature', $device, $temperature_oid, $temperature_id, 'cometsystem-p85xx', $descr, '10', '1', $lowlimit, null, null, $limit, $temperature); + discover_sensor(null, 'temperature', $device, $temperature_oid, $temperature_id, 'cometsystem-p85xx', $descr, '10', '1', $lowlimit, null, null, $limit, $temperature); } } } @@ -64,5 +64,5 @@ if (is_numeric($pre_cache['websensor_valuesInt']['tempInt.0'])) { $temperature = $pre_cache['websensor_valuesInt']['tempInt.0'] / 10; $high_limit = $pre_cache['websensor_settings']['tempHighInt.0'] / 10; $low_limit = $pre_cache['websensor_settings']['tempLowInt.0'] / 10; - discover_sensor($valid['sensor'], 'temperature', $device, $temperature_oid, $temperature_index, 'websensor', $descr, '10', '1', $low_limit, null, null, $high_limit, $temperature, 'snmp', null, null, $user_func); + discover_sensor(null, 'temperature', $device, $temperature_oid, $temperature_index, 'websensor', $descr, '10', '1', $low_limit, null, null, $high_limit, $temperature, 'snmp', null, null, $user_func); } diff --git a/includes/discovery/sensors/temperature/xos.inc.php b/includes/discovery/sensors/temperature/xos.inc.php index 21cfd4ec84..516b0954a3 100644 --- a/includes/discovery/sensors/temperature/xos.inc.php +++ b/includes/discovery/sensors/temperature/xos.inc.php @@ -13,5 +13,5 @@ $oid = '.1.3.6.1.4.1.1916.1.1.1.8.0'; // extremeCurrentTemperature $value = snmp_get($device, $oid, '-Oqv', 'EXTREME-SYSTEM-MIB'); if (is_numeric($value)) { - discover_sensor($valid['sensor'], 'temperature', $device, $oid, 1, 'extreme-temp', $descr, '1', '1', $low_limit, $low_warn_limit, $high_warn_limit, $high_limit, $value); + discover_sensor(null, 'temperature', $device, $oid, 1, 'extreme-temp', $descr, '1', '1', $low_limit, $low_warn_limit, $high_warn_limit, $high_limit, $value); } diff --git a/includes/discovery/sensors/temperature/zxdsl.inc.php b/includes/discovery/sensors/temperature/zxdsl.inc.php index e74c1af862..0b3957caaa 100644 --- a/includes/discovery/sensors/temperature/zxdsl.inc.php +++ b/includes/discovery/sensors/temperature/zxdsl.inc.php @@ -15,7 +15,7 @@ $value = str_replace('"', '', $value); if (is_numeric($value)) { discover_sensor( - $valid['sensor'], + null, 'temperature', $device, $valueoid, diff --git a/includes/discovery/sensors/tv_signal/terra-sdi480.inc.php b/includes/discovery/sensors/tv_signal/terra-sdi480.inc.php index 0496807180..3df631e73b 100644 --- a/includes/discovery/sensors/tv_signal/terra-sdi480.inc.php +++ b/includes/discovery/sensors/tv_signal/terra-sdi480.inc.php @@ -40,7 +40,7 @@ if (is_array($pre_cache['sdi480status'])) { $value = $signal / $divisor; $group = 'Inputs'; discover_sensor( - $valid['sensor'], + null, 'tv_signal', $device, $oid, diff --git a/includes/discovery/sensors/voltage/adva_fsp150.inc.php b/includes/discovery/sensors/voltage/adva_fsp150.inc.php index 6f14c8cec6..fea932a7ec 100644 --- a/includes/discovery/sensors/voltage/adva_fsp150.inc.php +++ b/includes/discovery/sensors/voltage/adva_fsp150.inc.php @@ -95,7 +95,7 @@ foreach (array_keys($pre_cache['adva_fsp150']) as $index) { $current = $pre_cache['adva_fsp150'][$index][$entry['sensor_name']] / $divisor; discover_sensor( - $valid['sensor'], + null, 'voltage', $device, $oid, diff --git a/includes/discovery/sensors/voltage/adva_fsp3kr7.inc.php b/includes/discovery/sensors/voltage/adva_fsp3kr7.inc.php index 8af7b1d3bf..01e8fc9f0a 100644 --- a/includes/discovery/sensors/voltage/adva_fsp3kr7.inc.php +++ b/includes/discovery/sensors/voltage/adva_fsp3kr7.inc.php @@ -32,7 +32,7 @@ if (is_array($pre_cache['adva_fsp3kr7_Card'])) { $current = $pre_cache['adva_fsp3kr7_Card'][$index]['eqptPhysInstValuePsuVoltInp'] / $divisor; discover_sensor( - $valid['sensor'], + null, 'voltage', $device, $oid, diff --git a/includes/discovery/sensors/voltage/apc.inc.php b/includes/discovery/sensors/voltage/apc.inc.php index 9d1e453c35..ad4c896f8c 100644 --- a/includes/discovery/sensors/voltage/apc.inc.php +++ b/includes/discovery/sensors/voltage/apc.inc.php @@ -21,7 +21,7 @@ if ($oids) { [$oid,$current] = explode(' ', $oids); $type = 'apc'; $descr = 'Battery Bus'; - discover_sensor($valid['sensor'], 'voltage', $device, $oid, $index, $type, $descr, $divisor, '1', null, null, null, null, $current / $divisor); + discover_sensor(null, 'voltage', $device, $oid, $index, $type, $descr, $divisor, '1', null, null, null, null, $current / $divisor); } unset($oids); @@ -41,7 +41,7 @@ if ($phasecount > 2) { $divisor = 1; $voltage = $data['upsPhaseOutputVoltage'] / $divisor; if ($voltage >= 0) { - discover_sensor($valid['sensor'], 'voltage', $device, $voltage_oid, $index, $type, $descr, $divisor, 1, null, null, null, null, $voltage); + discover_sensor(null, 'voltage', $device, $voltage_oid, $index, $type, $descr, $divisor, 1, null, null, null, null, $voltage); } } unset($index); @@ -54,10 +54,10 @@ if ($phasecount > 2) { $in_index = '3.1.3.' . $index; if (substr($index, 0, 1) == 2 && $data['upsPhaseInputVoltage'] != -1) { $descr = 'Phase ' . substr($index, -1) . ' Bypass Input'; - discover_sensor($valid['sensor'], 'voltage', $device, $voltage_oid, $in_index, $type, $descr, $divisor, 0, null, null, null, null, $voltage); + discover_sensor(null, 'voltage', $device, $voltage_oid, $in_index, $type, $descr, $divisor, 0, null, null, null, null, $voltage); } elseif (substr($index, 0, 1) == 1) { $descr = 'Phase ' . substr($index, -1) . ' Input'; - discover_sensor($valid['sensor'], 'voltage', $device, $voltage_oid, $in_index, $type, $descr, $divisor, 0, null, null, null, null, $voltage); + discover_sensor(null, 'voltage', $device, $voltage_oid, $in_index, $type, $descr, $divisor, 0, null, null, null, null, $voltage); } } } else { @@ -75,7 +75,7 @@ if ($phasecount > 2) { $index = $split_oid[count($split_oid) - 3]; $oid = '.1.3.6.1.4.1.318.1.1.8.5.3.3.1.3.' . $index . '.1.1'; $descr = 'Input Feed ' . chr(64 + $index); - discover_sensor($valid['sensor'], 'voltage', $device, $oid, "3.3.1.3.$index", $type, $descr, $divisor, '1', null, null, null, null, $current); + discover_sensor(null, 'voltage', $device, $oid, "3.3.1.3.$index", $type, $descr, $divisor, '1', null, null, null, null, $current); } } } @@ -96,7 +96,7 @@ if ($phasecount > 2) { if (count(explode("\n", $oids)) > 1) { $descr .= " $index"; } - discover_sensor($valid['sensor'], 'voltage', $device, $oid, "4.3.1.3.$index", $type, $descr, $divisor, '1', null, null, null, null, $current); + discover_sensor(null, 'voltage', $device, $oid, "4.3.1.3.$index", $type, $descr, $divisor, '1', null, null, null, null, $current); } } } @@ -117,7 +117,7 @@ if ($phasecount > 2) { [$oid,$current] = explode(' ', $oids); $type = 'apc'; $descr = 'Input'; - discover_sensor($valid['sensor'], 'voltage', $device, $oid, $index, $type, $descr, $divisor, '1', null, null, null, null, $current / $divisor); + discover_sensor(null, 'voltage', $device, $oid, $index, $type, $descr, $divisor, '1', null, null, null, null, $current / $divisor); } // upsHighPrecOutputVoltage $oids = snmp_get($device, '.1.3.6.1.4.1.318.1.1.1.4.3.1.0', '-OsqnU'); @@ -136,7 +136,7 @@ if ($phasecount > 2) { [$oid,$current] = explode(' ', $oids); $type = 'apc'; $descr = 'Output'; - discover_sensor($valid['sensor'], 'voltage', $device, $oid, $index, $type, $descr, $divisor, '1', null, null, null, null, $current / $divisor); + discover_sensor(null, 'voltage', $device, $oid, $index, $type, $descr, $divisor, '1', null, null, null, null, $current / $divisor); } // rPDUIdentDeviceLinetoLineVoltage $oids = snmp_get($device, '.1.3.6.1.4.1.318.1.1.12.1.15.0', '-OsqnU'); @@ -149,7 +149,7 @@ if ($phasecount > 2) { $type = 'apc'; $index = '1'; $descr = 'Input'; - discover_sensor($valid['sensor'], 'voltage', $device, $oid, $index, $type, $descr, $divisor, '1', null, null, null, null, $current); + discover_sensor(null, 'voltage', $device, $oid, $index, $type, $descr, $divisor, '1', null, null, null, null, $current); } } // rPDU2PhaseStatusVoltage @@ -163,7 +163,7 @@ if ($phasecount > 2) { $type = 'apc'; $index = '1'; $descr = 'Input'; - discover_sensor($valid['sensor'], 'voltage', $device, $oid, $index, $type, $descr, $divisor, '1', null, null, null, null, $current); + discover_sensor(null, 'voltage', $device, $oid, $index, $type, $descr, $divisor, '1', null, null, null, null, $current); } } } diff --git a/includes/discovery/sensors/voltage/areca.inc.php b/includes/discovery/sensors/voltage/areca.inc.php index d0119ba3c8..e85df88f96 100644 --- a/includes/discovery/sensors/voltage/areca.inc.php +++ b/includes/discovery/sensors/voltage/areca.inc.php @@ -18,7 +18,7 @@ if ($oids) { $current = (snmp_get($device, $oid, '-Oqv', '') / $divisor); if (trim($descr, '"') != 'Battery Status') { // Battery Status is charge percentage, or 255 when no BBU - discover_sensor($valid['sensor'], 'voltage', $device, $oid, $index, $type, trim($descr, '"'), $divisor, '1', null, null, null, null, $current); + discover_sensor(null, 'voltage', $device, $oid, $index, $type, trim($descr, '"'), $divisor, '1', null, null, null, null, $current); } } } diff --git a/includes/discovery/sensors/voltage/awplus.inc.php b/includes/discovery/sensors/voltage/awplus.inc.php index cc9d671c7a..e47a560445 100644 --- a/includes/discovery/sensors/voltage/awplus.inc.php +++ b/includes/discovery/sensors/voltage/awplus.inc.php @@ -15,7 +15,7 @@ if ($pre_cache['awplus-sfpddm']) { $descr = $tmp['ifName']; $oid = '.1.3.6.1.4.1.207.8.4.4.3.28.1.2.1.3.' . $index; discover_sensor( - $valid['sensor'], + null, 'voltage', $device, $oid, diff --git a/includes/discovery/sensors/voltage/benuos.inc.php b/includes/discovery/sensors/voltage/benuos.inc.php index bb418c9cb6..0f59cdd1e2 100644 --- a/includes/discovery/sensors/voltage/benuos.inc.php +++ b/includes/discovery/sensors/voltage/benuos.inc.php @@ -15,6 +15,6 @@ for ($index = 10; $index <= 11; $index++) { //Benu Voltage Sensors are index 10 $sensor_oid = ".1.3.6.1.4.1.39406.1.1.1.4.1.1.5.1.$index"; $descr = $data["1.$index"]['benuSensorName'] ?? null; $current = $data["1.$index"]['benuSensorValue'] ?? null; - discover_sensor($valid['sensor'], 'voltage', $device, $sensor_oid, $sensor_index, 'benuos', $descr, '1', '1', null, null, null, null, $current); + discover_sensor(null, 'voltage', $device, $sensor_oid, $sensor_index, 'benuos', $descr, '1', '1', null, null, null, null, $current); $sensor_index++; }//end loop diff --git a/includes/discovery/sensors/voltage/ceraos.inc.php b/includes/discovery/sensors/voltage/ceraos.inc.php index 48cb8cf90a..a479b54654 100644 --- a/includes/discovery/sensors/voltage/ceraos.inc.php +++ b/includes/discovery/sensors/voltage/ceraos.inc.php @@ -14,5 +14,5 @@ if (! empty($oids)) { [,$current] = explode(' ', $oids); $index = $oid; $descr = 'System voltage'; - discover_sensor($valid['sensor'], 'voltage', $device, $oid, $index, $type, $descr, $divisor, '1', null, null, null, null, $current); + discover_sensor(null, 'voltage', $device, $oid, $index, $type, $descr, $divisor, '1', null, null, null, null, $current); } diff --git a/includes/discovery/sensors/voltage/ciscosb.inc.php b/includes/discovery/sensors/voltage/ciscosb.inc.php index 7bdb286cb5..5d95a0537f 100644 --- a/includes/discovery/sensors/voltage/ciscosb.inc.php +++ b/includes/discovery/sensors/voltage/ciscosb.inc.php @@ -28,7 +28,7 @@ foreach ($pre_cache['ciscosb_rlPhyTestGetResult'] as $index => $ciscosb_data) { $entPhysicalIndex = $index; $entPhysicalIndex_measured = 'ports'; if (is_numeric($voltage) && ($value['rlPhyTestTableTransceiverTemp'] != 0)) { - discover_sensor($valid['sensor'], 'voltage', $device, $oid, $index, $sensor_type, $descr, $divisor, $multiplier, null, null, null, null, $voltage, 'snmp', $entPhysicalIndex, $entPhysicalIndex_measured); + discover_sensor(null, 'voltage', $device, $oid, $index, $sensor_type, $descr, $divisor, $multiplier, null, null, null, null, $voltage, 'snmp', $entPhysicalIndex, $entPhysicalIndex_measured); } } } diff --git a/includes/discovery/sensors/voltage/commander-plus.inc.php b/includes/discovery/sensors/voltage/commander-plus.inc.php index bb362a31e7..139abf1697 100644 --- a/includes/discovery/sensors/voltage/commander-plus.inc.php +++ b/includes/discovery/sensors/voltage/commander-plus.inc.php @@ -29,4 +29,4 @@ $multiplier = 1; $limit_low = 24; $limit = 57; $current = snmp_get($device, 'rectifierFloatVoltage.0', '-Oqv', 'CCPOWER-MIB'); -discover_sensor($valid['sensor'], 'voltage', $device, $oid, 'rectifierFloatVoltage', 'commander-plus', $descr, $divisor, $multiplier, $limit_low, null, null, $limit, $current); +discover_sensor(null, 'voltage', $device, $oid, 'rectifierFloatVoltage', 'commander-plus', $descr, $divisor, $multiplier, $limit_low, null, null, $limit, $current); diff --git a/includes/discovery/sensors/voltage/compas.inc.php b/includes/discovery/sensors/voltage/compas.inc.php index 3d815090c5..9601c74b5c 100644 --- a/includes/discovery/sensors/voltage/compas.inc.php +++ b/includes/discovery/sensors/voltage/compas.inc.php @@ -28,5 +28,5 @@ $index = 0; if (is_numeric($busVoltage)) { $sensorType = 'compas'; $descr = 'DC Bus Voltage'; - discover_sensor($valid['sensor'], 'voltage', $device, $curOID, $index, $sensorType, $descr, '1', '1', null, null, null, null, $busVoltage); + discover_sensor(null, 'voltage', $device, $curOID, $index, $sensorType, $descr, '1', '1', null, null, null, null, $busVoltage); } diff --git a/includes/discovery/sensors/voltage/comware.inc.php b/includes/discovery/sensors/voltage/comware.inc.php index 21dccb415e..213ddcac8b 100644 --- a/includes/discovery/sensors/voltage/comware.inc.php +++ b/includes/discovery/sensors/voltage/comware.inc.php @@ -33,6 +33,6 @@ foreach ($pre_cache['comware_oids'] as $index => $entry) { $entPhysicalIndex_measured = 'ports'; $descr = makeshortif($interface['ifDescr']) . ' Supply Voltage'; - discover_sensor($valid['sensor'], 'voltage', $device, $oid, 'volt-' . $index, 'comware', $descr, $divisor, $multiplier, $limit_low, $warn_limit_low, $warn_limit, $limit, $current, 'snmp', $entPhysicalIndex, $entPhysicalIndex_measured); + discover_sensor(null, 'voltage', $device, $oid, 'volt-' . $index, 'comware', $descr, $divisor, $multiplier, $limit_low, $warn_limit_low, $warn_limit, $limit, $current, 'snmp', $entPhysicalIndex, $entPhysicalIndex_measured); } } diff --git a/includes/discovery/sensors/voltage/cyberpower.inc.php b/includes/discovery/sensors/voltage/cyberpower.inc.php index 3feeca901a..f02d59cd9a 100644 --- a/includes/discovery/sensors/voltage/cyberpower.inc.php +++ b/includes/discovery/sensors/voltage/cyberpower.inc.php @@ -11,5 +11,5 @@ if ($oids) { $type = 'cyberpower'; $descr = 'Input'; $voltage = $voltage / 10; - discover_sensor($valid['sensor'], 'voltage', $device, $oid, '0', $type, $descr, $divisor, '1', null, null, null, null, $voltage); + discover_sensor(null, 'voltage', $device, $oid, '0', $type, $descr, $divisor, '1', null, null, null, null, $voltage); } diff --git a/includes/discovery/sensors/voltage/dell.inc.php b/includes/discovery/sensors/voltage/dell.inc.php index cf086e2bff..b30ce65957 100644 --- a/includes/discovery/sensors/voltage/dell.inc.php +++ b/includes/discovery/sensors/voltage/dell.inc.php @@ -35,7 +35,7 @@ foreach ((array) $temp as $index => $entry) { $warnlimit = $entry['voltageProbeUpperNonCriticalThreshold'] / $divisor; $limit = $entry['voltageProbeUpperCriticalThreshold'] / $divisor; - discover_sensor($valid['sensor'], 'voltage', $device, $cur_oid . $index, $index, 'dell', $descr, $divisor, '1', $lowlimit, $low_warn_limit, $warnlimit, $limit, $value, 'snmp', $index); + discover_sensor(null, 'voltage', $device, $cur_oid . $index, $index, 'dell', $descr, $divisor, '1', $lowlimit, $low_warn_limit, $warnlimit, $limit, $value, 'snmp', $index); } } diff --git a/includes/discovery/sensors/voltage/drac.inc.php b/includes/discovery/sensors/voltage/drac.inc.php index 953dc13972..524d615ad8 100644 --- a/includes/discovery/sensors/voltage/drac.inc.php +++ b/includes/discovery/sensors/voltage/drac.inc.php @@ -19,7 +19,7 @@ if ($oids) { $current = snmp_get($device, $voltage_oid, '-Oqv', 'IDRAC-MIB-SMIv2'); $high_limit = snmp_get($device, $limit_oid, '-Oqv', 'IDRAC-MIB-SMIv2'); $divisor = '1'; - discover_sensor($valid['sensor'], 'voltage', $device, $voltage_oid, $index, 'drac', $descr, $divisor, '1', 0, null, null, $high_limit, $current); + discover_sensor(null, 'voltage', $device, $voltage_oid, $index, 'drac', $descr, $divisor, '1', 0, null, null, $high_limit, $current); } } } diff --git a/includes/discovery/sensors/voltage/dsm.inc.php b/includes/discovery/sensors/voltage/dsm.inc.php index 7bda9913c5..826dc7ead5 100644 --- a/includes/discovery/sensors/voltage/dsm.inc.php +++ b/includes/discovery/sensors/voltage/dsm.inc.php @@ -24,26 +24,26 @@ $ups_device_model = str_replace('"', '', snmp_get($device, $ups_device_model_oid $ups_input_voltage_oid = '.1.3.6.1.4.1.6574.4.4.1.1.0'; $ups_input_voltage = snmp_get($device, $ups_input_voltage_oid, '-Oqv'); if (is_numeric($ups_input_voltage)) { - discover_sensor($valid['sensor'], 'voltage', $device, $ups_input_voltage_oid, 'UPSInputVoltageValue', $ups_device_manufacturer . ' ' . $ups_device_model, 'UPS Input Voltage Value', '1', '1', null, null, null, null, $ups_input_voltage); + discover_sensor(null, 'voltage', $device, $ups_input_voltage_oid, 'UPSInputVoltageValue', $ups_device_manufacturer . ' ' . $ups_device_model, 'UPS Input Voltage Value', '1', '1', null, null, null, null, $ups_input_voltage); } // UPS Input Voltage Nominal, example return : SNMPv2-SMI::enterprises.6574.4.4.1.4.0 = Opaque: Float: 230.000000 $ups_input_voltage_nominal_oid = '.1.3.6.1.4.1.6574.4.4.1.4.0'; $ups_input_voltage_nominal = snmp_get($device, $ups_input_voltage_nominal_oid, '-Oqv'); if (is_numeric($ups_input_voltage_nominal)) { - discover_sensor($valid['sensor'], 'voltage', $device, $ups_input_voltage_nominal_oid, 'UPSInputVoltageNominal', $ups_device_manufacturer . ' ' . $ups_device_model, 'UPS Input Voltage Nominal', '1', '1', null, null, null, null, $ups_input_voltage_nominal); + discover_sensor(null, 'voltage', $device, $ups_input_voltage_nominal_oid, 'UPSInputVoltageNominal', $ups_device_manufacturer . ' ' . $ups_device_model, 'UPS Input Voltage Nominal', '1', '1', null, null, null, null, $ups_input_voltage_nominal); } // UPS Battery Voltage Value, example return : SNMPv2-SMI::enterprises.6574.4.3.2.1.0 = Opaque: Float: 27.000000 $ups_battery_voltage_oid = '.1.3.6.1.4.1.6574.4.3.2.1.0'; $ups_battery_voltage = snmp_get($device, $ups_battery_voltage_oid, '-Oqv'); if (is_numeric($ups_battery_voltage)) { - discover_sensor($valid['sensor'], 'voltage', $device, $ups_battery_voltage_oid, 'UPSBatteryVoltage', $ups_device_manufacturer . ' ' . $ups_device_model, 'UPS Battery Voltage', '1', '1', null, null, null, null, $ups_battery_voltage); + discover_sensor(null, 'voltage', $device, $ups_battery_voltage_oid, 'UPSBatteryVoltage', $ups_device_manufacturer . ' ' . $ups_device_model, 'UPS Battery Voltage', '1', '1', null, null, null, null, $ups_battery_voltage); } // UPS Battery Voltage Nominal, example return : SNMPv2-SMI::enterprises.6574.4.3.2.2.0 = Opaque: Float: 24.000000 $ups_battery_voltage_nominal_oid = '.1.3.6.1.4.1.6574.4.3.2.2.0'; $ups_battery_voltage_nominal = snmp_get($device, $ups_battery_voltage_nominal_oid, '-Oqv'); if (is_numeric($ups_battery_voltage_nominal)) { - discover_sensor($valid['sensor'], 'voltage', $device, $ups_battery_voltage_nominal_oid, 'SystemStatus', $ups_device_manufacturer . ' ' . $ups_device_model, 'UPS Battery Voltage Nominal', '1', '1', null, null, null, null, $ups_battery_voltage_nominal); + discover_sensor(null, 'voltage', $device, $ups_battery_voltage_nominal_oid, 'SystemStatus', $ups_device_manufacturer . ' ' . $ups_device_model, 'UPS Battery Voltage Nominal', '1', '1', null, null, null, null, $ups_battery_voltage_nominal); } diff --git a/includes/discovery/sensors/voltage/eaton-ats.inc.php b/includes/discovery/sensors/voltage/eaton-ats.inc.php index 340b03373f..174a876c72 100644 --- a/includes/discovery/sensors/voltage/eaton-ats.inc.php +++ b/includes/discovery/sensors/voltage/eaton-ats.inc.php @@ -32,5 +32,5 @@ foreach ($oids as $volt_id => $data) { $divisor = 10; $current = $data['ats2InputVoltage'] / $divisor; - discover_sensor($valid['sensor'], 'voltage', $device, $volt_oid, $index, $type, $descr, $divisor, '1', null, null, null, null, $current); + discover_sensor(null, 'voltage', $device, $volt_oid, $index, $type, $descr, $divisor, '1', null, null, null, null, $current); } diff --git a/includes/discovery/sensors/voltage/eatonups.inc.php b/includes/discovery/sensors/voltage/eatonups.inc.php index 8084ec2f21..1395749b99 100644 --- a/includes/discovery/sensors/voltage/eatonups.inc.php +++ b/includes/discovery/sensors/voltage/eatonups.inc.php @@ -13,7 +13,7 @@ foreach ($oids as $volt_id => $data) { $type = 'xups'; $index = '1.2.5.' . $volt_id; - discover_sensor($valid['sensor'], 'voltage', $device, $volt_oid, $index, $type, $descr, $divisor, '1', null, null, null, null, $volt); + discover_sensor(null, 'voltage', $device, $volt_oid, $index, $type, $descr, $divisor, '1', null, null, null, null, $volt); } // XUPS-MIB::xupsInputVoltage.1 = INTEGER: 228 @@ -30,7 +30,7 @@ foreach ($oids as $volt_id => $data) { $current = $data['xupsInputVoltage'] / $divisor; $index = '3.4.1.2.' . $volt_id; - discover_sensor($valid['sensor'], 'voltage', $device, $volt_oid, $index, $type, $descr, $divisor, '1', null, null, null, null, $current); + discover_sensor(null, 'voltage', $device, $volt_oid, $index, $type, $descr, $divisor, '1', null, null, null, null, $current); } // XUPS-MIB::xupsOutputVoltage.1 = INTEGER: 228 @@ -48,7 +48,7 @@ foreach ($oids as $volt_id => $data) { $current = $data['xupsOutputVoltage'] / $divisor; $index = '4.4.1.2.' . $volt_id; - discover_sensor($valid['sensor'], 'voltage', $device, $volt_oid, $index, $type, $descr, $divisor, '1', null, null, null, null, $current); + discover_sensor(null, 'voltage', $device, $volt_oid, $index, $type, $descr, $divisor, '1', null, null, null, null, $current); } // XUPS-MIB::xupsBypassNumPhases.0 = INTEGER: 1 @@ -66,5 +66,5 @@ foreach ($oids as $volt_id => $data) { $current = $data['xupsBypassVoltage'] / $divisor; $index = '5.3.1.2.' . $volt_id; - discover_sensor($valid['sensor'], 'voltage', $device, $volt_oid, $index, $type, $descr, $divisor, '1', null, null, null, null, $current); + discover_sensor(null, 'voltage', $device, $volt_oid, $index, $type, $descr, $divisor, '1', null, null, null, null, $current); } diff --git a/includes/discovery/sensors/voltage/eltex-mes21xx.inc.php b/includes/discovery/sensors/voltage/eltex-mes21xx.inc.php index 9f338cce22..4d0146ef63 100644 --- a/includes/discovery/sensors/voltage/eltex-mes21xx.inc.php +++ b/includes/discovery/sensors/voltage/eltex-mes21xx.inc.php @@ -41,7 +41,7 @@ if ($oids) { $tmp = get_port_by_index_cache($device['device_id'], $ifIndex); $descr = $tmp['ifName']; discover_sensor( - $valid['sensor'], 'voltage', $device, $split, 'SfpVolt' . $ifIndex, 'rlPhyTestTableTransceiverSupply', 'SfpVolt-' . $descr, $divisor, '1', $low_limit, $low_warn_limit, $high_warn_limit, $high_limit, $value + null, 'voltage', $device, $split, 'SfpVolt' . $ifIndex, 'rlPhyTestTableTransceiverSupply', 'SfpVolt-' . $descr, $divisor, '1', $low_limit, $low_warn_limit, $high_warn_limit, $high_limit, $value ); } } diff --git a/includes/discovery/sensors/voltage/eltex-mes23xx.inc.php b/includes/discovery/sensors/voltage/eltex-mes23xx.inc.php index c149be70c6..3343c5e033 100644 --- a/includes/discovery/sensors/voltage/eltex-mes23xx.inc.php +++ b/includes/discovery/sensors/voltage/eltex-mes23xx.inc.php @@ -37,7 +37,7 @@ if ($pre_cache['eltex-mes23xx-sfp']) { $descr = $tmp['ifName']; $oid = '.1.3.6.1.4.1.89.90.1.2.1.3.' . $ifIndex . '.6'; discover_sensor( - $valid['sensor'], + null, 'voltage', $device, $oid, diff --git a/includes/discovery/sensors/voltage/eltex-mes24xx.inc.php b/includes/discovery/sensors/voltage/eltex-mes24xx.inc.php index 87f364d5f7..1629a380cf 100644 --- a/includes/discovery/sensors/voltage/eltex-mes24xx.inc.php +++ b/includes/discovery/sensors/voltage/eltex-mes24xx.inc.php @@ -46,7 +46,7 @@ if (! empty($eltexPhyTransceiverDiagnosticTable['supplyVoltage'])) { $descr = get_port_by_index_cache($device['device_id'], $ifIndex)['ifName']; $oid = Oid::toNumeric('ELTEX-PHY-MIB::eltexPhyTransceiverDiagnosticCurrentValue.' . $ifIndex . '.2.1'); discover_sensor( - $valid['sensor'], + null, 'voltage', $device, $oid, diff --git a/includes/discovery/sensors/voltage/enlogic-pdu.inc.php b/includes/discovery/sensors/voltage/enlogic-pdu.inc.php index 453e22503b..6e838dc70c 100644 --- a/includes/discovery/sensors/voltage/enlogic-pdu.inc.php +++ b/includes/discovery/sensors/voltage/enlogic-pdu.inc.php @@ -34,7 +34,7 @@ foreach ($pre_cache['enlogic_pdu_input'] as $index => $data) { $high_warn = $data['pduInputPhaseConfigVoltageUpperWarningThreshold']; $current = $data['pduInputPhaseStatusVoltage']; if ($current > 0) { - discover_sensor($valid['sensor'], 'voltage', $device, $oid, $index, $type, $descr, $divisor, '1', $low_limit, $low_warn, $high_warn, $high_limit, $current); + discover_sensor(null, 'voltage', $device, $oid, $index, $type, $descr, $divisor, '1', $low_limit, $low_warn, $high_warn, $high_limit, $current); } } } diff --git a/includes/discovery/sensors/voltage/fs-net-pdu.inc.php b/includes/discovery/sensors/voltage/fs-net-pdu.inc.php index a0706cb4df..0cce3e8e49 100644 --- a/includes/discovery/sensors/voltage/fs-net-pdu.inc.php +++ b/includes/discovery/sensors/voltage/fs-net-pdu.inc.php @@ -25,5 +25,5 @@ $oid = '.1.3.6.1.4.1.30966.10.3.2.1.0'; $voltage = snmp_get($device, $oid, '-Oqv'); if ($voltage > 0) { - discover_sensor($valid['sensor'], 'voltage', $device, $oid, 0, 'PDU L1', 'Voltage', 1, 1, null, null, null, null, $voltage); + discover_sensor(null, 'voltage', $device, $oid, 0, 'PDU L1', 'Voltage', 1, 1, null, null, null, null, $voltage); } diff --git a/includes/discovery/sensors/voltage/gamatronicups.inc.php b/includes/discovery/sensors/voltage/gamatronicups.inc.php index 6bf2310ce6..53e06405d2 100644 --- a/includes/discovery/sensors/voltage/gamatronicups.inc.php +++ b/includes/discovery/sensors/voltage/gamatronicups.inc.php @@ -10,7 +10,7 @@ for ($i = 1; $i <= 3; $i++) { $lowlimit = 0; $limit = null; - discover_sensor($valid['sensor'], 'voltage', $device, $volt_oid, $index, $type, $descr, $divisor, '1', null, null, null, null, $volt); + discover_sensor(null, 'voltage', $device, $volt_oid, $index, $type, $descr, $divisor, '1', null, null, null, null, $volt); } for ($i = 1; $i <= 3; $i++) { @@ -23,5 +23,5 @@ for ($i = 1; $i <= 3; $i++) { $lowlimit = 0; $limit = null; - discover_sensor($valid['sensor'], 'voltage', $device, $volt_oid, $index, $type, $descr, $divisor, '1', null, null, null, null, $volt); + discover_sensor(null, 'voltage', $device, $volt_oid, $index, $type, $descr, $divisor, '1', null, null, null, null, $volt); } diff --git a/includes/discovery/sensors/voltage/geist-pdu.inc.php b/includes/discovery/sensors/voltage/geist-pdu.inc.php index f5193e7ae3..26f3feff20 100644 --- a/includes/discovery/sensors/voltage/geist-pdu.inc.php +++ b/includes/discovery/sensors/voltage/geist-pdu.inc.php @@ -28,7 +28,7 @@ foreach ($pre_cache['geist_pdu_iec'] as $index => $data) { $descr = $data['ctrl3ChIECName'] . ' Phase A'; $oid = $current_oid . $index; if ($value > 0) { - discover_sensor($valid['sensor'], 'voltage', $device, $oid, 'ctrl3ChIECVoltsA', 'geist-pdu', $descr, 1, 1, null, null, null, null, $value); + discover_sensor(null, 'voltage', $device, $oid, 'ctrl3ChIECVoltsA', 'geist-pdu', $descr, 1, 1, null, null, null, null, $value); } $value = $data['ctrl3ChIECVoltsB']; @@ -36,7 +36,7 @@ foreach ($pre_cache['geist_pdu_iec'] as $index => $data) { $descr = $data['ctrl3ChIECName'] . ' Phase B'; $oid = $current_oid . $index; if ($value > 0) { - discover_sensor($valid['sensor'], 'voltage', $device, $oid, 'ctrl3ChIECVoltsB', 'geist-pdu', $descr, 1, 1, null, null, null, null, $value); + discover_sensor(null, 'voltage', $device, $oid, 'ctrl3ChIECVoltsB', 'geist-pdu', $descr, 1, 1, null, null, null, null, $value); } $value = $data['ctrl3ChIECVoltsC']; @@ -44,6 +44,6 @@ foreach ($pre_cache['geist_pdu_iec'] as $index => $data) { $descr = $data['ctrl3ChIECName'] . ' Phase C'; $oid = $current_oid . $index; if ($value > 0) { - discover_sensor($valid['sensor'], 'voltage', $device, $oid, 'ctrl3ChIECVoltsC', 'geist-pdu', $descr, 1, 1, null, null, null, null, $value); + discover_sensor(null, 'voltage', $device, $oid, 'ctrl3ChIECVoltsC', 'geist-pdu', $descr, 1, 1, null, null, null, null, $value); } } diff --git a/includes/discovery/sensors/voltage/geist-watchdog.inc.php b/includes/discovery/sensors/voltage/geist-watchdog.inc.php index b442cc0608..a928350894 100644 --- a/includes/discovery/sensors/voltage/geist-watchdog.inc.php +++ b/includes/discovery/sensors/voltage/geist-watchdog.inc.php @@ -26,5 +26,5 @@ $value = snmp_get($device, 'climateVolts', '-Oqv', 'GEIST-MIB-V3'); $current_oid = '.1.3.6.1.4.1.21239.2.2.1.14.1'; $descr = 'Voltage'; if (is_numeric($value)) { - discover_sensor($valid['sensor'], 'voltage', $device, $current_oid, 'climateVolts', 'geist-watchdog', $descr, 1, 1, null, null, null, null, $value); + discover_sensor(null, 'voltage', $device, $current_oid, 'climateVolts', 'geist-watchdog', $descr, 1, 1, null, null, null, null, $value); } diff --git a/includes/discovery/sensors/voltage/hytera.inc.php b/includes/discovery/sensors/voltage/hytera.inc.php index 8d948d81bc..9c11e39782 100644 --- a/includes/discovery/sensors/voltage/hytera.inc.php +++ b/includes/discovery/sensors/voltage/hytera.inc.php @@ -17,7 +17,7 @@ if ($oids !== false) { $descr = 'Voltage ' . $index; $oid = '.1.3.6.1.4.1.40297.1.2.1.2.1.' . $index; $voltage = hytera_h2f(str_replace('"', '', snmp_get($device, $oid, '-OUqnv', '')), 2); - discover_sensor($valid['sensor'], 'voltage', $device, $oid, $index, $type, $descr, $divisor, '1', 11.00, 11.5, 14.5, 15, $voltage); + discover_sensor(null, 'voltage', $device, $oid, $index, $type, $descr, $divisor, '1', 11.00, 11.5, 14.5, 15, $voltage); } } } diff --git a/includes/discovery/sensors/voltage/ict-pdu.inc.php b/includes/discovery/sensors/voltage/ict-pdu.inc.php index 55a97ea67d..b042c5bad4 100644 --- a/includes/discovery/sensors/voltage/ict-pdu.inc.php +++ b/includes/discovery/sensors/voltage/ict-pdu.inc.php @@ -34,5 +34,5 @@ if (! empty($systemVoltage)) { $type = 'ict-pdu'; $current_value = $systemVoltage / $divisor; - discover_sensor($valid['sensor'], 'voltage', $device, $oid, $index, $type, $descr, $divisor, '1', null, null, null, null, $current_value); + discover_sensor(null, 'voltage', $device, $oid, $index, $type, $descr, $divisor, '1', null, null, null, null, $current_value); } diff --git a/includes/discovery/sensors/voltage/ict-psu.inc.php b/includes/discovery/sensors/voltage/ict-psu.inc.php index 0f500769cc..b917c3376a 100644 --- a/includes/discovery/sensors/voltage/ict-psu.inc.php +++ b/includes/discovery/sensors/voltage/ict-psu.inc.php @@ -35,7 +35,7 @@ if (! empty($inputVoltage)) { $type = 'ict-psu'; $currentValue = $inputVoltage / $divisor; echo "got in\n"; - discover_sensor($valid['sensor'], 'voltage', $device, $oid, $index, $type, $descr, $divisor, '1', null, null, null, null, $currentValue); + discover_sensor(null, 'voltage', $device, $oid, $index, $type, $descr, $divisor, '1', null, null, null, null, $currentValue); } // Output Voltage @@ -50,5 +50,5 @@ if (! empty($outputVoltage)) { $type = 'ict-psu'; $currentValue = $outputVoltage / $divisor; - discover_sensor($valid['sensor'], 'voltage', $device, $oid, $index, $type, $descr, $divisor, '1', null, null, null, null, $currentValue); + discover_sensor(null, 'voltage', $device, $oid, $index, $type, $descr, $divisor, '1', null, null, null, null, $currentValue); } diff --git a/includes/discovery/sensors/voltage/ipoman.inc.php b/includes/discovery/sensors/voltage/ipoman.inc.php index cf420ca853..5ec1ec494c 100644 --- a/includes/discovery/sensors/voltage/ipoman.inc.php +++ b/includes/discovery/sensors/voltage/ipoman.inc.php @@ -20,7 +20,7 @@ if (is_array($oids)) { $low_limit = $entry['inletConfigVoltageLow']; $high_limit = $entry['inletConfigVoltageHigh']; - discover_sensor($valid['sensor'], 'voltage', $device, $volt_oid, $index, 'ipoman', $descr, $divisor, '1', $low_limit, null, null, $high_limit, $current); + discover_sensor(null, 'voltage', $device, $volt_oid, $index, 'ipoman', $descr, $divisor, '1', $low_limit, null, null, $high_limit, $current); // FIXME: iPoMan 1201 also says it has 2 inlets, at least until firmware 1.06 - wtf? } } diff --git a/includes/discovery/sensors/voltage/linux.inc.php b/includes/discovery/sensors/voltage/linux.inc.php index df22d27392..9d8c29a880 100644 --- a/includes/discovery/sensors/voltage/linux.inc.php +++ b/includes/discovery/sensors/voltage/linux.inc.php @@ -23,7 +23,7 @@ if (! empty($pre_cache['raspberry_pi_sensors'])) { } $value = current($pre_cache['raspberry_pi_sensors']['raspberry.' . $volt]); if (is_numeric($value)) { - discover_sensor($valid['sensor'], 'voltage', $device, $oid . $volt, $volt, $sensor_type, $descr, '1', '1', null, null, null, null, $value); + discover_sensor(null, 'voltage', $device, $oid . $volt, $volt, $sensor_type, $descr, '1', '1', null, null, null, null, $value); } else { break; } @@ -61,7 +61,7 @@ foreach (explode("\n", $oids) as $data) { $descr = trim(str_ireplace('Voltage', '', $descr)); if ($monitor == 'true') { - discover_sensor($valid['sensor'], 'voltage', $device, $volt_oid, $index, $type, $descr, $divisor, '1', $lowlimit, null, null, $limit, $current); + discover_sensor(null, 'voltage', $device, $volt_oid, $index, $type, $descr, $divisor, '1', $lowlimit, null, null, $limit, $current); } } }//end if @@ -78,13 +78,13 @@ if (preg_match('/(Linux).+(ntc)/', $device['sysDescr'])) { $index = '116.2'; $value = snmp_get($device, $oid . $index, '-Oqv'); if (is_numeric($value)) { - discover_sensor($valid['sensor'], 'voltage', $device, $oid . $index, $index, $sensor_type, $descr, '1', '1', $lowlimit, $lowwarnlimit, $warnlimit, $limit, $value); + discover_sensor(null, 'voltage', $device, $oid . $index, $index, $sensor_type, $descr, '1', '1', $lowlimit, $lowwarnlimit, $warnlimit, $limit, $value); } $descr = 'VBUS voltage'; $index = '116.4'; $value = snmp_get($device, $oid . $index, '-Oqv'); if (is_numeric($value)) { - discover_sensor($valid['sensor'], 'voltage', $device, $oid . $index, $index, $sensor_type, $descr, '1', '1', $lowlimit, $lowwarnlimit, $warnlimit, $limit, $value); + discover_sensor(null, 'voltage', $device, $oid . $index, $index, $sensor_type, $descr, '1', '1', $lowlimit, $lowwarnlimit, $warnlimit, $limit, $value); } $lowlimit = 2.75; $lowwarnlimit = 2.8; @@ -94,6 +94,6 @@ if (preg_match('/(Linux).+(ntc)/', $device['sysDescr'])) { $index = '116.6'; $value = snmp_get($device, $oid . $index, '-Oqv'); if (is_numeric($value)) { - discover_sensor($valid['sensor'], 'voltage', $device, $oid . $index, $index, $sensor_type, $descr, '1', '1', $lowlimit, $lowwarnlimit, $warnlimit, $limit, $value); + discover_sensor(null, 'voltage', $device, $oid . $index, $index, $sensor_type, $descr, '1', '1', $lowlimit, $lowwarnlimit, $warnlimit, $limit, $value); } } diff --git a/includes/discovery/sensors/voltage/mgeups.inc.php b/includes/discovery/sensors/voltage/mgeups.inc.php index 65b5841ca4..de3786d783 100644 --- a/includes/discovery/sensors/voltage/mgeups.inc.php +++ b/includes/discovery/sensors/voltage/mgeups.inc.php @@ -23,7 +23,7 @@ for ($i = 1; $i <= $numPhase; $i++) { $divisor = 10; $index = $i; - discover_sensor($valid['sensor'], 'voltage', $device, $volt_oid, $index, $type, $descr, $divisor, '1', null, null, null, null, $current); + discover_sensor(null, 'voltage', $device, $volt_oid, $index, $type, $descr, $divisor, '1', null, null, null, null, $current); } $oids = trim(snmp_walk($device, 'mgeinputVoltage', '-OsqnU', 'MG-SNMP-UPS-MIB')); @@ -48,5 +48,5 @@ for ($i = 1; $i <= $numPhase; $i++) { $divisor = 10; $index = (100 + $i); - discover_sensor($valid['sensor'], 'voltage', $device, $volt_oid, $index, $type, $descr, $divisor, '1', null, null, null, null, $current); + discover_sensor(null, 'voltage', $device, $volt_oid, $index, $type, $descr, $divisor, '1', null, null, null, null, $current); } diff --git a/includes/discovery/sensors/voltage/microsemipdsine.inc.php b/includes/discovery/sensors/voltage/microsemipdsine.inc.php index fa4cf6ab64..f67442e016 100644 --- a/includes/discovery/sensors/voltage/microsemipdsine.inc.php +++ b/includes/discovery/sensors/voltage/microsemipdsine.inc.php @@ -35,5 +35,5 @@ if (! empty($mainVoltage)) { $oid = '.1.3.6.1.4.1.7428.1.2.2.1.1.2.1'; $current_value = $mainVoltage / $divisor; - discover_sensor($valid['sensor'], 'voltage', $device, $oid, $index, $type, $descr, $divisor, '1', null, null, null, null, $current_value); + discover_sensor(null, 'voltage', $device, $oid, $index, $type, $descr, $divisor, '1', null, null, null, null, $current_value); } diff --git a/includes/discovery/sensors/voltage/netagent2.inc.php b/includes/discovery/sensors/voltage/netagent2.inc.php index 6b98758e30..29041e1a03 100644 --- a/includes/discovery/sensors/voltage/netagent2.inc.php +++ b/includes/discovery/sensors/voltage/netagent2.inc.php @@ -75,7 +75,7 @@ if ($in_phaseNum == '1') { $descr = 'Input'; discover_sensor( - $valid['sensor'], + null, 'voltage', $device, $in_voltage_oid, @@ -106,7 +106,7 @@ if ($in_phaseNum == '3') { $descr = 'In L1'; discover_sensor( - $valid['sensor'], + null, 'voltage', $device, $in_voltage1_oid, @@ -134,7 +134,7 @@ if ($in_phaseNum == '3') { $descr = 'In L2'; discover_sensor( - $valid['sensor'], + null, 'voltage', $device, $in_voltage2_oid, @@ -162,7 +162,7 @@ if ($in_phaseNum == '3') { $descr = 'In L3'; discover_sensor( - $valid['sensor'], + null, 'voltage', $device, $in_voltage3_oid, @@ -193,7 +193,7 @@ if ($in_phaseNum == '1') { $descr = 'Output'; discover_sensor( - $valid['sensor'], + null, 'voltage', $device, $out_voltage_oid, @@ -225,7 +225,7 @@ if ($out_phaseNum == '3') { $descr = 'Out L1'; discover_sensor( - $valid['sensor'], + null, 'voltage', $device, $out_voltage1_oid, @@ -253,7 +253,7 @@ if ($out_phaseNum == '3') { $descr = 'Out L2'; discover_sensor( - $valid['sensor'], + null, 'voltage', $device, $out_voltage2_oid, @@ -281,7 +281,7 @@ if ($out_phaseNum == '3') { $descr = 'Out L3'; discover_sensor( - $valid['sensor'], + null, 'voltage', $device, $out_voltage3_oid, @@ -313,7 +313,7 @@ if ($out_phaseNum == '3') { $descr = 'Bypass L1'; discover_sensor( - $valid['sensor'], + null, 'voltage', $device, $bypass_voltage1_oid, @@ -341,7 +341,7 @@ if ($out_phaseNum == '3') { $descr = 'Bypass L2'; discover_sensor( - $valid['sensor'], + null, 'voltage', $device, $bypass_voltage2_oid, @@ -369,7 +369,7 @@ if ($out_phaseNum == '3') { $descr = 'Bypass L3'; discover_sensor( - $valid['sensor'], + null, 'voltage', $device, $bypass_voltage3_oid, @@ -417,7 +417,7 @@ if (! empty($battery_voltage1) || $battery_voltage1 == 0) { $descr = 'Battery'; discover_sensor( - $valid['sensor'], + null, 'voltage', $device, $battery_voltage1_oid, diff --git a/includes/discovery/sensors/voltage/netonix.inc.php b/includes/discovery/sensors/voltage/netonix.inc.php index 0e6040940b..533867f6b9 100644 --- a/includes/discovery/sensors/voltage/netonix.inc.php +++ b/includes/discovery/sensors/voltage/netonix.inc.php @@ -32,7 +32,7 @@ if (is_array($oids)) { $oid = '.1.3.6.1.4.1.46242.4.1.3.' . $index; $current = $entry['voltage']; $divisor = 100; - discover_sensor($valid['sensor'], 'voltage', $device, $oid, $index, $device['os'], $descr, $divisor, '1', null, null, null, null, $current); + discover_sensor(null, 'voltage', $device, $oid, $index, $device['os'], $descr, $divisor, '1', null, null, null, null, $current); } } } diff --git a/includes/discovery/sensors/voltage/netvision.inc.php b/includes/discovery/sensors/voltage/netvision.inc.php index bebd404883..05e1c6c7dd 100644 --- a/includes/discovery/sensors/voltage/netvision.inc.php +++ b/includes/discovery/sensors/voltage/netvision.inc.php @@ -10,7 +10,7 @@ $index = 200; $lowlimit = 0; $limit = null; -discover_sensor($valid['sensor'], 'voltage', $device, $volt_oid, $index, $type, $descr, $divisor, '1', null, null, null, null, $volt); +discover_sensor(null, 'voltage', $device, $volt_oid, $index, $type, $descr, $divisor, '1', null, null, null, null, $volt); for ($i = 1; $i <= 3; $i++) { $volt_oid = ".1.3.6.1.4.1.4555.1.1.1.1.3.3.1.2.$i"; @@ -22,7 +22,7 @@ for ($i = 1; $i <= 3; $i++) { $lowlimit = 0; $limit = null; - discover_sensor($valid['sensor'], 'voltage', $device, $volt_oid, $index, $type, $descr, $divisor, '1', null, null, null, null, $volt); + discover_sensor(null, 'voltage', $device, $volt_oid, $index, $type, $descr, $divisor, '1', null, null, null, null, $volt); } for ($i = 1; $i <= 3; $i++) { @@ -35,5 +35,5 @@ for ($i = 1; $i <= 3; $i++) { $lowlimit = 0; $limit = null; - discover_sensor($valid['sensor'], 'voltage', $device, $volt_oid, $index, $type, $descr, $divisor, '1', null, null, null, null, $volt); + discover_sensor(null, 'voltage', $device, $volt_oid, $index, $type, $descr, $divisor, '1', null, null, null, null, $volt); } diff --git a/includes/discovery/sensors/voltage/onefs.inc.php b/includes/discovery/sensors/voltage/onefs.inc.php index fa792d2769..af10a9cb0f 100644 --- a/includes/discovery/sensors/voltage/onefs.inc.php +++ b/includes/discovery/sensors/voltage/onefs.inc.php @@ -30,7 +30,7 @@ foreach ($oids as $index => $entry) { $descr = $entry['powerSensorDescription']; $oid = '.1.3.6.1.4.1.12124.2.55.1.4.' . $index; $current = $entry['powerSensorValue']; - discover_sensor($valid['sensor'], 'voltage', $device, $oid, $index, 'onefs', $descr, '1', '1', null, null, null, null, $current); + discover_sensor(null, 'voltage', $device, $oid, $index, 'onefs', $descr, '1', '1', null, null, null, null, $current); } } diff --git a/includes/discovery/sensors/voltage/pbn.inc.php b/includes/discovery/sensors/voltage/pbn.inc.php index d79a6d4913..d181c9d913 100644 --- a/includes/discovery/sensors/voltage/pbn.inc.php +++ b/includes/discovery/sensors/voltage/pbn.inc.php @@ -26,6 +26,6 @@ foreach ($pre_cache['pbn_oids'] as $index => $entry) { $value = $entry['voltage'] / $divisor; $entPhysicalIndex = $index; $entPhysicalIndex_measured = 'ports'; - discover_sensor($valid['sensor'], 'voltage', $device, $oid, '' . $index, 'pbn', $descr, $divisor, $multiplier, $limit_low, $warn_limit_low, $warn_limit, $limit, $value, 'snmp', $entPhysicalIndex, $entPhysicalIndex_measured); + discover_sensor(null, 'voltage', $device, $oid, '' . $index, 'pbn', $descr, $divisor, $multiplier, $limit_low, $warn_limit_low, $warn_limit, $limit, $value, 'snmp', $entPhysicalIndex, $entPhysicalIndex_measured); } } diff --git a/includes/discovery/sensors/voltage/powerlogic.inc.php b/includes/discovery/sensors/voltage/powerlogic.inc.php index 272f2e2507..c54253fb01 100644 --- a/includes/discovery/sensors/voltage/powerlogic.inc.php +++ b/includes/discovery/sensors/voltage/powerlogic.inc.php @@ -29,7 +29,7 @@ if (is_numeric($data['vVab'][1])) { $index = 'vVab'; $descr = 'Line A to B'; $current = $data['vVab'][1]; - discover_sensor($valid['sensor'], 'voltage', $device, $current_oid, $index, 'powerlogic', $descr, 1, 1, null, null, null, null, $current); + discover_sensor(null, 'voltage', $device, $current_oid, $index, 'powerlogic', $descr, 1, 1, null, null, null, null, $current); } if (is_numeric($data['vVbc'][1])) { @@ -37,7 +37,7 @@ if (is_numeric($data['vVbc'][1])) { $index = 'vVbc'; $descr = 'Line B to C'; $current = $data['vVbc'][1]; - discover_sensor($valid['sensor'], 'voltage', $device, $current_oid, $index, 'powerlogic', $descr, 1, 1, null, null, null, null, $current); + discover_sensor(null, 'voltage', $device, $current_oid, $index, 'powerlogic', $descr, 1, 1, null, null, null, null, $current); } if (is_numeric($data['vVca'][1])) { @@ -45,7 +45,7 @@ if (is_numeric($data['vVca'][1])) { $index = 'vVca'; $descr = 'Line C to A'; $current = $data['vVca'][1]; - discover_sensor($valid['sensor'], 'voltage', $device, $current_oid, $index, 'powerlogic', $descr, 1, 1, null, null, null, null, $current); + discover_sensor(null, 'voltage', $device, $current_oid, $index, 'powerlogic', $descr, 1, 1, null, null, null, null, $current); } if (is_numeric($data['vVan'][1])) { @@ -53,7 +53,7 @@ if (is_numeric($data['vVan'][1])) { $index = 'vVan'; $descr = 'Line A to neutral'; $current = $data['vVan'][1]; - discover_sensor($valid['sensor'], 'voltage', $device, $current_oid, $index, 'powerlogic', $descr, 1, 1, null, null, null, null, $current); + discover_sensor(null, 'voltage', $device, $current_oid, $index, 'powerlogic', $descr, 1, 1, null, null, null, null, $current); } if (is_numeric($data['vVbn'][1])) { @@ -61,7 +61,7 @@ if (is_numeric($data['vVbn'][1])) { $index = 'vVbn'; $descr = 'Line B to neutral'; $current = $data['vVbn'][1]; - discover_sensor($valid['sensor'], 'voltage', $device, $current_oid, $index, 'powerlogic', $descr, 1, 1, null, null, null, null, $current); + discover_sensor(null, 'voltage', $device, $current_oid, $index, 'powerlogic', $descr, 1, 1, null, null, null, null, $current); } if (is_numeric($data['vVcn'][1])) { @@ -69,7 +69,7 @@ if (is_numeric($data['vVcn'][1])) { $index = 'vVcn'; $descr = 'Line C to neutral'; $current = $data['vVcn'][1]; - discover_sensor($valid['sensor'], 'voltage', $device, $current_oid, $index, 'powerlogic', $descr, 1, 1, null, null, null, null, $current); + discover_sensor(null, 'voltage', $device, $current_oid, $index, 'powerlogic', $descr, 1, 1, null, null, null, null, $current); } unset($data); diff --git a/includes/discovery/sensors/voltage/procurve.inc.php b/includes/discovery/sensors/voltage/procurve.inc.php index 5e0a50eb93..e4409a8ebb 100644 --- a/includes/discovery/sensors/voltage/procurve.inc.php +++ b/includes/discovery/sensors/voltage/procurve.inc.php @@ -18,7 +18,7 @@ foreach ($pre_cache['procurve_hpicfXcvrInfoTable'] as $index => $entry) { $entPhysicalIndex_measured = 'ports'; foreach ($dbquery as $dbindex => $dbresult) { $descr = makeshortif($dbresult['ifDescr']) . ' Port Supply Voltage'; - discover_sensor($valid['sensor'], 'voltage', $device, $oid, 'hpicfXcvrVoltage.' . $index, 'procurve', $descr, $divisor, $multiplier, $limit_low, $warn_limit_low, $warn_limit, $limit, $current, 'snmp', $entPhysicalIndex, $entPhysicalIndex_measured); + discover_sensor(null, 'voltage', $device, $oid, 'hpicfXcvrVoltage.' . $index, 'procurve', $descr, $divisor, $multiplier, $limit_low, $warn_limit_low, $warn_limit, $limit, $current, 'snmp', $entPhysicalIndex, $entPhysicalIndex_measured); } } } diff --git a/includes/discovery/sensors/voltage/raritan-pdu.inc.php b/includes/discovery/sensors/voltage/raritan-pdu.inc.php index 8214ffca36..33f361b600 100644 --- a/includes/discovery/sensors/voltage/raritan-pdu.inc.php +++ b/includes/discovery/sensors/voltage/raritan-pdu.inc.php @@ -34,7 +34,7 @@ foreach ($pre_cache['raritan_inletTable'] as $index => $raritan_data) { $warn_limit = $raritan_data['inletVoltageLowerWarning'] / $divisor; $high_limit = $raritan_data['inletVoltageLowerCritical'] / $divisor; $current = $pre_cache['raritan_inletPoleTable'][$index][$x]['inletPoleVoltage'] / $divisor; - discover_sensor($valid['sensor'], 'voltage', $device, $oid, $tmp_index, 'raritan', $descr, $divisor, 1, $low_limit, $low_limit, $warn_limit, $high_limit, $current); + discover_sensor(null, 'voltage', $device, $oid, $tmp_index, 'raritan', $descr, $divisor, 1, $low_limit, $low_limit, $warn_limit, $high_limit, $current); } } @@ -45,6 +45,6 @@ foreach ($pre_cache['raritan_inletLabel'] as $index => $inlet_data) { $inlet_power = (snmp_get($device, "measurementsInletSensorValue.$index.rmsVoltage", '-Ovq', 'PDU2-MIB') / $inlet_divisor); if ($inlet_power >= 0) { - discover_sensor($valid['sensor'], 'voltage', $device, $inlet_oid, $index . '.rmsVoltage', 'raritan', $inlet_descr, $inlet_divisor, 1, null, null, null, null, $inlet_power); + discover_sensor(null, 'voltage', $device, $inlet_oid, $index . '.rmsVoltage', 'raritan', $inlet_descr, $inlet_divisor, 1, null, null, null, null, $inlet_power); } } diff --git a/includes/discovery/sensors/voltage/rfc1628.inc.php b/includes/discovery/sensors/voltage/rfc1628.inc.php index d90d422fcb..d50af5b78e 100644 --- a/includes/discovery/sensors/voltage/rfc1628.inc.php +++ b/includes/discovery/sensors/voltage/rfc1628.inc.php @@ -10,7 +10,7 @@ if (is_numeric($battery_volts)) { $divisor = get_device_divisor($device, $pre_cache['poweralert_serial'] ?? 0, 'voltage', $volt_oid); discover_sensor( - $valid['sensor'], + null, 'voltage', $device, $volt_oid, @@ -45,7 +45,7 @@ foreach ($output_volts as $index => $data) { $upsOutputVoltage_value = Number::cast($upsOutputVoltage_value); discover_sensor( - $valid['sensor'], + null, 'voltage', $device, $volt_oid, @@ -80,7 +80,7 @@ foreach ($input_volts as $index => $data) { $upsInputVoltage_value = Number::cast($upsInputVoltage_value); discover_sensor( - $valid['sensor'], + null, 'voltage', $device, $volt_oid, @@ -112,7 +112,7 @@ foreach ($bypass_volts as $index => $data) { $data['upsBypassVoltage'] = Number::cast($data['upsBypassVoltage']); discover_sensor( - $valid['sensor'], + null, 'voltage', $device, $volt_oid, diff --git a/includes/discovery/sensors/voltage/saf.inc.php b/includes/discovery/sensors/voltage/saf.inc.php index 7057999613..af57ad3ea9 100644 --- a/includes/discovery/sensors/voltage/saf.inc.php +++ b/includes/discovery/sensors/voltage/saf.inc.php @@ -13,5 +13,5 @@ if (! empty($oids)) { [,$current] = explode(' ', $oids); $index = $oid; $descr = 'System voltage'; - discover_sensor($valid['sensor'], 'voltage', $device, $oid, $index, $type, $descr, $divisor, '1', null, null, null, null, $current); + discover_sensor(null, 'voltage', $device, $oid, $index, $type, $descr, $divisor, '1', null, null, null, null, $current); } diff --git a/includes/discovery/sensors/voltage/schleifenbauer.inc.php b/includes/discovery/sensors/voltage/schleifenbauer.inc.php index ff910a1b5b..24e316bd83 100644 --- a/includes/discovery/sensors/voltage/schleifenbauer.inc.php +++ b/includes/discovery/sensors/voltage/schleifenbauer.inc.php @@ -14,7 +14,7 @@ foreach ($pre_cache['sdbMgmtCtrlDevUnitAddress'] ?? [] as $sdbMgmtCtrlDevUnitAdd // See includes/discovery/entity-physical/schleifenbauer.inc.php for an explanation why we set this as the entPhysicalIndex. $entPhysicalIndex = $sdbMgmtCtrlDevUnitAddress * 1000000 + 100000 + $sdbDevInIndex * 1000 + 110; - discover_sensor($valid['sensor'], 'voltage', $device, $voltage_oid, $serial_input, 'schleifenbauer', $descr, $divisor, '1', null, null, null, null, $voltage, 'snmp', $entPhysicalIndex); + discover_sensor(null, 'voltage', $device, $voltage_oid, $serial_input, 'schleifenbauer', $descr, $divisor, '1', null, null, null, null, $voltage, 'snmp', $entPhysicalIndex); } } @@ -29,5 +29,5 @@ foreach ($pre_cache['sdbDevOutMtActualVoltage'] ?? [] as $sdbDevOutMtIndex => $s // See includes/discovery/entity-physical/schleifenbauer.inc.php for an explanation why we set this as the entPhysicalIndex. $entPhysicalIndex = $sdbMgmtCtrlDevUnitAddress * 1000000 + 200000 + $sdbDevOutMtIndex * 1000 + 110; - discover_sensor($valid['sensor'], 'voltage', $device, $voltage_oid, $serial_input, 'schleifenbauer', $descr, $divisor, '1', null, null, null, null, $voltage, 'snmp', $entPhysicalIndex); + discover_sensor(null, 'voltage', $device, $voltage_oid, $serial_input, 'schleifenbauer', $descr, $divisor, '1', null, null, null, null, $voltage, 'snmp', $entPhysicalIndex); } diff --git a/includes/discovery/sensors/voltage/siklu.inc.php b/includes/discovery/sensors/voltage/siklu.inc.php index a255f26c45..d9d7f9e4db 100644 --- a/includes/discovery/sensors/voltage/siklu.inc.php +++ b/includes/discovery/sensors/voltage/siklu.inc.php @@ -14,6 +14,6 @@ if (! empty($oids)) { if (! empty($oids)) { [,$current] = explode(' ', $oids); $descr = 'System voltage'; - discover_sensor($valid['sensor'], 'voltage', $device, $num_oid . '.' . $sensor_index, $text_oid . '.' . $sensor_index, $type, $descr, 1, 1, null, null, null, null, $current); + discover_sensor(null, 'voltage', $device, $num_oid . '.' . $sensor_index, $text_oid . '.' . $sensor_index, $type, $descr, 1, 1, null, null, null, null, $current); } } diff --git a/includes/discovery/sensors/voltage/sinetica.inc.php b/includes/discovery/sensors/voltage/sinetica.inc.php index dd7fa64732..7775bf9d31 100644 --- a/includes/discovery/sensors/voltage/sinetica.inc.php +++ b/includes/discovery/sensors/voltage/sinetica.inc.php @@ -32,7 +32,7 @@ if (! empty($battery_current) || $battery_current == 0) { $type = 'sinetica'; $index = '2.5.0'; - discover_sensor($valid['sensor'], 'voltage', $device, $battery_oid, $index, $type, $descr, $divisor, '1', null, null, null, null, $current); + discover_sensor(null, 'voltage', $device, $battery_oid, $index, $type, $descr, $divisor, '1', null, null, null, null, $current); } $oids = snmpwalk_cache_oid_num($device, '.1.3.6.1.4.1.13891.101.3.3.1.3', []); @@ -49,7 +49,7 @@ foreach ($oids as $oid => $data) { $type = 'sinetica'; $index = '3.3.1.3.' . $current_id; - discover_sensor($valid['sensor'], 'voltage', $device, $current_oid, $index, $type, $descr, 1, 1, null, null, null, null, $current); + discover_sensor(null, 'voltage', $device, $current_oid, $index, $type, $descr, 1, 1, null, null, null, null, $current); } $oids = snmpwalk_cache_oid_num($device, '.1.3.6.1.4.1.13891.101.4.4.1.2', []); @@ -66,5 +66,5 @@ foreach ($oids as $oid => $data) { $type = 'sinetica'; $index = '4.4.1.2.' . $current_id; - discover_sensor($valid['sensor'], 'voltage', $device, $current_oid, $index, $type, $descr, 1, '1', null, null, null, null, $current); + discover_sensor(null, 'voltage', $device, $current_oid, $index, $type, $descr, 1, '1', null, null, null, null, $current); } diff --git a/includes/discovery/sensors/voltage/sitemonitor.inc.php b/includes/discovery/sensors/voltage/sitemonitor.inc.php index e454d14672..dd93a81b61 100644 --- a/includes/discovery/sensors/voltage/sitemonitor.inc.php +++ b/includes/discovery/sensors/voltage/sitemonitor.inc.php @@ -24,12 +24,12 @@ */ $oid = '.1.3.6.1.4.1.32050.2.1.27.5.1'; $current = (snmp_get($device, $oid, '-Oqv') / 10); -discover_sensor($valid['sensor'], 'voltage', $device, $oid, 1, 'sitemonitor', 'Shunt Input', 10, 1, null, null, null, null, $current); +discover_sensor(null, 'voltage', $device, $oid, 1, 'sitemonitor', 'Shunt Input', 10, 1, null, null, null, null, $current); $oid = '.1.3.6.1.4.1.32050.2.1.27.5.2'; $current = (snmp_get($device, $oid, '-Oqv') / 10); -discover_sensor($valid['sensor'], 'voltage', $device, $oid, 2, 'sitemonitor', 'Power 1', 10, 1, null, null, null, null, $current); +discover_sensor(null, 'voltage', $device, $oid, 2, 'sitemonitor', 'Power 1', 10, 1, null, null, null, null, $current); $oid = '.1.3.6.1.4.1.32050.2.1.27.5.3'; $current = (snmp_get($device, $oid, '-Oqv') / 10); -discover_sensor($valid['sensor'], 'voltage', $device, $oid, 3, 'sitemonitor', 'Power 2', 10, 1, null, null, null, null, $current); +discover_sensor(null, 'voltage', $device, $oid, 3, 'sitemonitor', 'Power 2', 10, 1, null, null, null, null, $current); diff --git a/includes/discovery/sensors/voltage/terra.inc.php b/includes/discovery/sensors/voltage/terra.inc.php index f5e0889bc3..1c3a1d71fd 100644 --- a/includes/discovery/sensors/voltage/terra.inc.php +++ b/includes/discovery/sensors/voltage/terra.inc.php @@ -10,7 +10,7 @@ if ($device['os'] === 'terra') { if (strpos($device['sysDescr'], $row[0]) !== false) { $c = snmp_get($device, $row[1], '-Oqv') / 10; if (is_numeric($c)) { - discover_sensor($valid['sensor'], 'voltage', $device, $row[1], 0, $row[0], 'Supply voltage', 10, 1, null, null, null, null, $c); + discover_sensor(null, 'voltage', $device, $row[1], 0, $row[0], 'Supply voltage', 10, 1, null, null, null, null, $c); } } } diff --git a/includes/discovery/sensors/voltage/tpdin.inc.php b/includes/discovery/sensors/voltage/tpdin.inc.php index 9e050af9c5..92ae1608a1 100644 --- a/includes/discovery/sensors/voltage/tpdin.inc.php +++ b/includes/discovery/sensors/voltage/tpdin.inc.php @@ -51,7 +51,7 @@ $tpdin_oids = [ foreach ($tpdin_oids as $data) { if ($data['current'] > 0) { - discover_sensor($valid['sensor'], 'voltage', $device, $data['oid'], $data['index'], $device['os'], $data['descr'], 10, '1', null, null, null, null, $data['current']); + discover_sensor(null, 'voltage', $device, $data['oid'], $data['index'], $device['os'], $data['descr'], 10, '1', null, null, null, null, $data['current']); } } diff --git a/includes/discovery/sensors/voltage/unix.inc.php b/includes/discovery/sensors/voltage/unix.inc.php index e899e14774..d7275d3ffc 100644 --- a/includes/discovery/sensors/voltage/unix.inc.php +++ b/includes/discovery/sensors/voltage/unix.inc.php @@ -34,7 +34,7 @@ if (! empty($snmpData)) { $value = intval($lmData[$type . 'Value']) / $divisor; if (! empty($descr)) { $oid = Oid::toNumeric('LM-SENSORS-MIB::' . $type . 'Value.' . $index); - discover_sensor($valid['sensor'], 'voltage', $device, $oid, $index, 'lmsensors', $descr, $divisor, 1, null, null, null, null, $value, 'snmp', null, null, null, 'lmsensors'); + discover_sensor(null, 'voltage', $device, $oid, $index, 'lmsensors', $descr, $divisor, 1, null, null, null, null, $value, 'snmp', null, null, null, 'lmsensors'); } } } @@ -55,7 +55,7 @@ if (! empty($snmpData)) { if (is_numeric($value)) { $oid = Oid::toNumeric('NET-SNMP-EXTEND-MIB::nsExtendOutLine."ups-nut".' . $index); discover_sensor( - $valid['sensor'], + null, 'voltage', $device, $oid, diff --git a/includes/polling/unix-agent.inc.php b/includes/polling/unix-agent.inc.php index f66b92f9ac..066e09de58 100644 --- a/includes/polling/unix-agent.inc.php +++ b/includes/polling/unix-agent.inc.php @@ -206,7 +206,7 @@ if ($device['os_group'] == 'unix' || $device['os'] == 'windows') { if (! empty($agent_sensors)) { echo 'Sensors: '; - check_valid_sensors($device, 'temperature', $valid['sensor'], 'agent'); + app('sensor-discovery')->sync(sensor_class: 'temperature', poller_type: 'agent'); d_echo($agent_sensors); if (count($agent_sensors) > 0) { record_sensor_data($device, $agent_sensors); diff --git a/includes/polling/unix-agent/hddtemp.inc.php b/includes/polling/unix-agent/hddtemp.inc.php index 140ef9a054..bd9bcd5219 100644 --- a/includes/polling/unix-agent/hddtemp.inc.php +++ b/includes/polling/unix-agent/hddtemp.inc.php @@ -11,7 +11,7 @@ if (isset($agent_data['hddtemp']) && $agent_data['hddtemp'] != '|') { [$blockdevice,$descr,$temperature,$unit] = explode('|', $disk, 4); $diskcount++; $temperature = trim(str_replace('C', '', $temperature)); - discover_sensor($valid['sensor'], 'temperature', $device, '', $diskcount, 'hddtemp', "$blockdevice: $descr", '1', '1', null, null, null, null, $temperature, 'agent'); + discover_sensor(null, 'temperature', $device, '', $diskcount, 'hddtemp', "$blockdevice: $descr", '1', '1', null, null, null, null, $temperature, 'agent'); dbUpdate(['sensor_current' => $temperature], 'sensors', '`sensor_index` = ? AND `sensor_class` = ? AND `poller_type` = ? AND `device_id` = ?', [$diskcount, 'temperature', 'agent', $device['device_id']]); $tmp_agent_sensors = dbFetchRow("SELECT * FROM `sensors` WHERE `sensor_index` = ? AND `device_id` = ? AND `sensor_class` = 'temperature' AND `poller_type` = 'agent' AND `sensor_deleted` = 0 LIMIT 1", [$diskcount, $device['device_id']]); $tmp_agent_sensors['new_value'] = $temperature;