mirror of
https://github.com/librenms/librenms.git
synced 2024-09-23 11:29:23 +00:00
Merge pull request #1235 from Calvario/master
Improved Temp Support for Synology and States for varying items
This commit is contained in:
Neil Lathwood
commit
9712897672
@ -31,6 +31,7 @@ Contributors to LibreNMS:
|
||||
- Thom Seddon <thom@seddonmedia.co.uk> (thomseddon)
|
||||
- Vitali Kari <vitali.kari@gmail.com> (vitalisator)
|
||||
- James Campbell <neokjames@gmail.com> (neokjames)
|
||||
- Steve Calvário <calvario.steve@gmail.com> (Calvario)
|
||||
|
||||
[1]: http://observium.org/ "Observium web site"
|
||||
|
||||
|
||||
74
includes/discovery/states/dsm.inc.php
Normal file
74
includes/discovery/states/dsm.inc.php
Normal file
@ -0,0 +1,74 @@
|
||||
<?php
|
||||
|
||||
/*
|
||||
* LibreNMS
|
||||
*
|
||||
* Copyright (c) 2015 Steve Calvário <https://github.com/Calvario/>
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License as published by the
|
||||
* Free Software Foundation, either version 3 of the License, or (at your
|
||||
* option) any later version. Please see LICENSE.txt at the top level of
|
||||
* the source code distribution for details.
|
||||
*/
|
||||
|
||||
if ($device['os'] == "dsm") {
|
||||
|
||||
echo "DSM States";
|
||||
|
||||
// System Status (Value : 1 Normal, 2 Failed)
|
||||
$system_status_oid = '.1.3.6.1.4.1.6574.1.1.0';
|
||||
$system_status = snmp_get($device, $system_status_oid, "-Oqv");
|
||||
discover_sensor($valid['sensor'], 'state', $device, $system_status_oid, 'SystemStatus', 'snmp', 'System Status', '1', '1', NULL, NULL, NULL, NULL, $system_status);
|
||||
|
||||
|
||||
// Power Status OID (Value : 1 Normal, 2 Failed)
|
||||
$power_status_oid = '.1.3.6.1.4.1.6574.1.3.0';
|
||||
$power_status = snmp_get($device, $power_status_oid, "-Oqv");
|
||||
discover_sensor($valid['sensor'], 'state', $device, $power_status_oid, 'PowerStatus', 'snmp', 'Power Status', '1', '1', NULL, NULL, NULL, NULL, $power_status);
|
||||
|
||||
|
||||
// System Fan Status OID (Value : 1 Normal, 2 Failed)
|
||||
$system_fan_status_oid = '.1.3.6.1.4.1.6574.1.4.1.0';
|
||||
$system_fan_status = snmp_get($device, $system_fan_status_oid, "-Oqv");
|
||||
discover_sensor($valid['sensor'], 'state', $device, $system_fan_status_oid, 'SystemFanStatus', 'snmp', 'System Fan Status', '1', '1', NULL, NULL, NULL, NULL, $system_fan_status);
|
||||
|
||||
|
||||
// CPU Fan Status OID (Value : 1 Normal, 2 Failed)
|
||||
$cpu_fan_status_oid = '.1.3.6.1.4.1.6574.1.4.2.0';
|
||||
$cpu_fan_status = snmp_get($device, $cpu_fan_status_oid, "-Oqv");
|
||||
discover_sensor($valid['sensor'], 'state', $device, $cpu_fan_status_oid, 'CPUFanStatus', 'snmp', 'CPU Fan Status', '1', '1', NULL, NULL, NULL, NULL, $cpu_fan_status);
|
||||
|
||||
|
||||
// UPS Status OID (Value : OL - On Line, OB - On Battery)
|
||||
$ups_status_oid = '.1.3.6.1.4.1.6574.4.2.1.0';
|
||||
$ups_status = snmp_get($device, $ups_status_oid, "-Oqv");
|
||||
// Temp because only support INT
|
||||
if((string)$ups_status == '"OL"'){ $ups_status = 1; } else { $ups_status = 2; }
|
||||
discover_sensor($valid['sensor'], 'state', $device, $ups_status_oid, 'UPSStatus', 'snmp', 'UPS Status', '1', '1', NULL, NULL, NULL, NULL, $ups_status);
|
||||
|
||||
|
||||
// DSM Upgrade Available OID (Value : 1 Available, 2 Unavailable, 3 Connecting, 4 Disconnected, 5 Others)
|
||||
$dsm_upgrade_available_oid = '.1.3.6.1.4.1.6574.1.4.2.0';
|
||||
$dsm_upgrade_available = snmp_get($device, $dsm_upgrade_available_oid, "-Oqv");
|
||||
discover_sensor($valid['sensor'], 'state', $device, $dsm_upgrade_available_oid, 'DSMUpgradeStatus', 'snmp', 'DSM Upgrade Status', '1', '1', NULL, NULL, NULL, NULL, $dsm_upgrade_available);
|
||||
|
||||
|
||||
// RAID Status OID (Value : 1 Normal, 2 Repairing, 3 Migrating, 4 Expanding, 5 Deleting, 6 Creating, 7 RaidSyncing, 8 RaidParityChecking, 9 RaidAssembling, 10 Canceling, 11 Degrade, 12 Crashed)
|
||||
$raid_status_oid = '.1.3.6.1.4.1.6574.3.1.1.3';
|
||||
$raid_status = snmp_get($device, $raid_status_oid, "-Oqv");
|
||||
discover_sensor($valid['sensor'], 'state', $device, $raid_status_oid, 'RAIDStatus', 'snmp', 'RAID Status', '1', '1', NULL, NULL, NULL, NULL, $raid_status);
|
||||
|
||||
|
||||
// Disks Status OID (Value : 1 Normal, 2 Initialized, 3 Not Initialized, 4 System Partition Failed, 5 Crashed )
|
||||
$disks_status_oid = '.1.3.6.1.4.1.6574.2.1.1.5.';
|
||||
$disks = snmpwalk_cache_multi_oid($device, 'diskTable', array(), 'SYNOLOGY-DISK-MIB');
|
||||
if (is_array($disks)) {
|
||||
foreach ($disks as $disk_number => $entry) {
|
||||
$disk_oid = $disks_status_oid.$disk_number;
|
||||
$disk_status = $entry['diskStatus'];
|
||||
$disk_information = $entry['diskID'].' '.$entry['diskModel'].' Status';
|
||||
discover_sensor($valid['sensor'], 'state', $device, $disk_oid, 'DiskStatus'.$disk_number, 'snmp', $disk_information, '1', '1', NULL, NULL, NULL, NULL, $disk_status);
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1,21 +1,34 @@
|
||||
<?php
|
||||
|
||||
if ($device['os'] == 'dsm') {
|
||||
echo "DSM ";
|
||||
$oid = '2';
|
||||
$temp_oid = '.1.3.6.1.4.1.6574.1.2';
|
||||
$current = snmp_get($device,$temp_oid,"-Oqv");
|
||||
discover_sensor($valid['sensor'], 'temperature', $device, $temp_oid, $oid, 'snmp', 'System Temperature', '1', '1', NULL, NULL, NULL, NULL, $current);
|
||||
|
||||
$disks = snmpwalk_cache_multi_oid($device, "diskTable", array(), "SYNOLOGY-DISK-MIB");
|
||||
if (is_array($disks)) {
|
||||
$cur_oid = '.1.3.6.1.4.1.6574.2.1.1.6.';
|
||||
foreach ($disks as $index => $entry) {
|
||||
$oid = $index;
|
||||
$disk_oid = $cur_oid.$index;
|
||||
$current = $entry['diskTemperature'];
|
||||
$descr = $entry['diskID'] . ' ' . $entry['diskModel'];
|
||||
discover_sensor($valid['sensor'], 'temperature', $device, $disk_oid, $oid, 'snmp', $descr, '1', '1', NULL, NULL, NULL, NULL, $current);
|
||||
echo "DSM temperature ";
|
||||
|
||||
// DiskStation Temperature
|
||||
$diskstation_temperature_oid = '.1.3.6.1.4.1.6574.1.2.0';
|
||||
// DiskStation Disk Temperature
|
||||
$disk_temperature_oid = '.1.3.6.1.4.1.6574.2.1.1.6.';
|
||||
|
||||
|
||||
// Get DiskStation temperature
|
||||
$diskstation_temperature = snmp_get($device, $diskstation_temperature_oid, "-Oqv");
|
||||
// Save the DiskStation temperature
|
||||
discover_sensor($valid['sensor'], 'temperature', $device, $diskstation_temperature_oid, '2', 'snmp', 'System Temperature', '1', '1', NULL, NULL, NULL, NULL, $diskstation_temperature);
|
||||
|
||||
|
||||
// Get all disks in the device
|
||||
$disks = snmpwalk_cache_multi_oid($device, 'diskTable', array(), 'SYNOLOGY-DISK-MIB');
|
||||
// Parse all disks in the device to get the temperature
|
||||
if (is_array($disks)) {
|
||||
foreach ($disks as $disk_number => $entry) {
|
||||
// Get the disk temperature full oid
|
||||
$disk_oid = $disk_temperature_oid.$disk_number;
|
||||
// Get the temperature for the disk
|
||||
$disk_temperature = $entry['diskTemperature'];
|
||||
// Getting the disk information (Number and model)
|
||||
$disk_information = $entry['diskID'] . ' ' . $entry['diskModel'];
|
||||
// Save the temperature for the disk
|
||||
discover_sensor($valid['sensor'], 'temperature', $device, $disk_oid, $disk_number, 'snmp', $disk_information, '1', '1', NULL, NULL, NULL, NULL, $disk_temperature);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user