Allow inserting null values for sensors (#15470)

* Allow inserting null values for sensors

* Update ericsson-ml.inc.php

* Update rittal-cmc-iii-sensors.inc.php
This commit is contained in:
Jellyfrog
2023-10-17 13:18:17 +02:00
committed by GitHub
parent 37f833129f
commit 187a4d36de
3 changed files with 2 additions and 8 deletions

View File

@@ -254,12 +254,6 @@ function discover_sensor(&$valid, $class, $device, $oid, $index, $type, $descr,
'rrd_type' => $rrd_type,
];
foreach ($insert as $key => $val_check) {
if (! isset($val_check)) {
unset($insert[$key]);
}
}
$inserted = dbInsert($insert, 'sensors');
d_echo("( $inserted inserted )\n");

View File

@@ -190,7 +190,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'] ?? null, $sensor_data['multiplier'] ?? null, $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($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']);
if (isset($sensor_data['logic'])) {
create_sensor_to_state_index($device, $sensor_data['name'], $sensor_id);

View File

@@ -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, null, null, null, null, null, $temperature);
discover_sensor($valid['sensor'], 'temperature', $device, $oid, $index, $sensor_type, $descr, $divisor, 1, null, null, null, null, $temperature);
}