nicolas/librenms
1
0
Fork 0
mirror of https://github.com/stylersnico/librenms.git synced 2026-08-02 00:32:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for Avtech

Browse Source 
Trim quotes from description
Correct sensor type
Allow sensor id of 0
Correct indexes for sensors
This commit is contained in:
Tony Murray
2016-03-09 12:34:29 -06:00
parent 6199d36936
commit eb9281ff10
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
includes/discovery/functions.inc.php
+3 -3
View File
@@ -725,7 +725,7 @@ function avtech_add_sensor($device, $sensor) {
global $valid; global $valid;
// set the id, must be unique // set the id, must be unique
if ($sensor['id']) { if (isset($sensor['id'])) {
$id = $sensor['id']; $id = $sensor['id'];
} }
else { else {
@@ -755,13 +755,13 @@ function avtech_add_sensor($device, $sensor) {
d_echo('Sensor value: ' . $value . "\n"); d_echo('Sensor value: ' . $value . "\n");
// get the type // get the type
$type = $device['type'] ? $device['type'] : 'temperature'; $type = $sensor['type'] ? $sensor['type'] : 'temperature';
d_echo('Sensor type: ' . $type . "\n"); d_echo('Sensor type: ' . $type . "\n");
// set the description // set the description
if ($sensor['descr_oid']) { if ($sensor['descr_oid']) {
$descr = snmp_get($device, $sensor['descr_oid'], '-OvQ'); $descr = trim(snmp_get($device, $sensor['descr_oid'], '-OvQ'), '"');
} }
elseif ($sensor['descr']) { elseif ($sensor['descr']) {
$descr = $sensor['descr']; $descr = $sensor['descr'];
includes/discovery/sensors/temperatures/avtech.inc.php
+10 -10
View File
@@ -8,21 +8,21 @@ if ($device['os'] == 'avtech') {
$device_oid = '.1.3.6.1.4.1.20916.1.7.'; $device_oid = '.1.3.6.1.4.1.20916.1.7.';
$internal = array( $internal = array(
'id' => 1, 'id' => 0,
'oid' => $device_oid.'1.1.1.1.0', 'oid' => $device_oid.'1.1.1.1.0',
'descr_oid' => $device_oid.'1.1.2.0', 'descr_oid' => $device_oid.'1.1.2.0',
); );
avtech_add_sensor($device, $internal); avtech_add_sensor($device, $internal);
$sen1 = array( $sen1 = array(
'id' => 2, 'id' => 1,
'oid' => $device_oid.'1.2.1.1.0', 'oid' => $device_oid.'1.2.1.1.0',
'descr_oid' => $device_oid.'1.2.1.3.0', 'descr_oid' => $device_oid.'1.2.1.3.0',
); );
avtech_add_sensor($device, $sen1); avtech_add_sensor($device, $sen1);
$sen2 = array( $sen2 = array(
'id' => 3, 'id' => 2,
'oid' => $device_oid.'1.2.2.1.0', 'oid' => $device_oid.'1.2.2.1.0',
'descr_oid' => $device_oid.'1.2.2.3.0', 'descr_oid' => $device_oid.'1.2.2.3.0',
); );
@@ -33,7 +33,7 @@ if ($device['os'] == 'avtech') {
$device_oid = '.1.3.6.1.4.1.20916.1.1.'; $device_oid = '.1.3.6.1.4.1.20916.1.1.';
$internal = array( $internal = array(
'id' => 1, 'id' => 0,
'oid' => $device_oid.'1.1.1.0', 'oid' => $device_oid.'1.1.1.0',
'descr' => 'Internal', 'descr' => 'Internal',
'max_oid' => $device_oid.'3.1.0', 'max_oid' => $device_oid.'3.1.0',
@@ -42,7 +42,7 @@ if ($device['os'] == 'avtech') {
avtech_add_sensor($device, $internal); avtech_add_sensor($device, $internal);
$sen1 = array( $sen1 = array(
'id' => 2, 'id' => 1,
'oid' => $device_oid.'1.1.2.0', 'oid' => $device_oid.'1.1.2.0',
'descr' => 'Sensor 1', 'descr' => 'Sensor 1',
'max_oid' => $device_oid.'3.3.0', 'max_oid' => $device_oid.'3.3.0',
@@ -51,7 +51,7 @@ if ($device['os'] == 'avtech') {
avtech_add_sensor($device, $sen1); avtech_add_sensor($device, $sen1);
$sen2 = array( $sen2 = array(
'id' => 3, 'id' => 2,
'oid' => $device_oid.'1.1.3.0', 'oid' => $device_oid.'1.1.3.0',
'descr' => 'Sensor 2', 'descr' => 'Sensor 2',
'max_oid' => $device_oid.'3.5.0', 'max_oid' => $device_oid.'3.5.0',
@@ -60,7 +60,7 @@ if ($device['os'] == 'avtech') {
avtech_add_sensor($device, $sen2); avtech_add_sensor($device, $sen2);
$sen3 = array( $sen3 = array(
'id' => 4, 'id' => 3,
'oid' => $device_oid.'1.1.4.0', 'oid' => $device_oid.'1.1.4.0',
'descr' => 'Sensor 3', 'descr' => 'Sensor 3',
'max_oid' => $device_oid.'3.7.0', 'max_oid' => $device_oid.'3.7.0',
@@ -74,7 +74,7 @@ if ($device['os'] == 'avtech') {
$divisor = 1; $divisor = 1;
$internal = array( $internal = array(
'id' => 1, 'id' => 0,
'oid' => $device_oid.'1.1.1.2.0', 'oid' => $device_oid.'1.1.1.2.0',
'descr_oid' => $device_oid.'1.1.2.1.0', 'descr_oid' => $device_oid.'1.1.2.1.0',
'divisor' => $divisor, 'divisor' => $divisor,
@@ -82,7 +82,7 @@ if ($device['os'] == 'avtech') {
avtech_add_sensor($device, $internal); avtech_add_sensor($device, $internal);
$sen1 = array( $sen1 = array(
'id' => 2, 'id' => 1,
'oid' => $device_oid.'1.2.2.1.0', 'oid' => $device_oid.'1.2.2.1.0',
'descr_oid' => $device_oid.'1.2.1.6.0', 'descr_oid' => $device_oid.'1.2.1.6.0',
'divisor' => $divisor, 'divisor' => $divisor,
@@ -90,7 +90,7 @@ if ($device['os'] == 'avtech') {
avtech_add_sensor($device, $sen1); avtech_add_sensor($device, $sen1);
$sen2 = array( $sen2 = array(
'id' => 3, 'id' => 2,
'oid' => $device_oid.'1.2.2.1.0', 'oid' => $device_oid.'1.2.2.1.0',
'descr_oid' => $device_oid.'1.2.2.6.0', 'descr_oid' => $device_oid.'1.2.2.6.0',
'divisor' => $divisor, 'divisor' => $divisor,