commit version 22.12.12447

This commit is contained in:
2023-01-01 22:36:12 -05:00
parent af1b03d79f
commit b948283a96
744 changed files with 620715 additions and 27381 deletions

View File

@ -1,30 +0,0 @@
<?php
/**
* Observium
*
* This file is part of Observium.
*
* @package observium
* @subpackage discovery
* @copyright (C) 2006-2013 Adam Armstrong, (C) 2013-2019 Observium Limited
*
*/
# lookup for storage data
$entry = snmpwalk_cache_oid($device, 'swStorage', NULL, 'EMBEDDED-NGX-MIB');
if (is_array($entry))
{
$index = 0;
$descr = "Config Storage";
$free = $entry[$index]['swStorageConfigFree'] * 1024;
$total = $entry[$index]['swStorageConfigTotal'] * 1024;
$used = $total - $free;
discover_storage($valid['storage'], $device, $index, 'StorageConfig', 'EMBEDDED-NGX-MIB', $descr, 1024, $total, $used);
}
unset ($entry, $index, $descr, $total, $used, $free);
// EOF

View File

@ -1,52 +0,0 @@
<?php
/**
* Observium
*
* This file is part of Observium.
*
* @package observium
* @subpackage discovery
* @copyright (C) 2006-2013 Adam Armstrong, (C) 2013-2021 Observium Limited
*
*/
$mib = 'GPFS-MIB';
$cache_discovery['gpfs-mib'] = snmpwalk_cache_oid($device, "gpfsFileSystemStatusTable", array(), $mib);
if (safe_count($cache_discovery['gpfs-mib'])) {
echo(" $mib ");
/*
Available data:
Array
(
[gpfsFileSystemName] => scratch_gs
[gpfsFileSystemStatus] => recovered
[gpfsFileSystemXstatus] => OFW
[gpfsFileSystemTotalSpaceL] => 1946157056
[gpfsFileSystemTotalSpaceH] => 94
[gpfsFileSystemNumTotalInodesL] => 402653184
[gpfsFileSystemNumTotalInodesH] => 0
[gpfsFileSystemFreeSpaceL] => 37208064
[gpfsFileSystemFreeSpaceH] => 26
[gpfsFileSystemNumFreeInodesL] => 326910126
[gpfsFileSystemNumFreeInodesH] => 0
)
*/
foreach ($cache_discovery['gpfs-mib'] as $index => $storage)
{
$fstype = "gpfs";
$descr = "/".$storage['gpfsFileSystemName'];
$hc = 1;
$size = snmp_size64_high_low($storage['gpfsFileSystemTotalSpaceH'], $storage['gpfsFileSystemTotalSpaceL']) * 1024;
$free = snmp_size64_high_low($storage['gpfsFileSystemFreeSpaceH'], $storage['gpfsFileSystemFreeSpaceL']) * 1024;
$used = $size - $free;
discover_storage($valid['storage'], $device, $index, $fstype, $mib, $descr, 1024, $size, $used, array('storage_hc' => $hc));
unset($deny, $fstype, $descr, $size, $used, $free, $percent, $hc);
}
unset($index, $storage);
}

View File

@ -6,7 +6,7 @@
*
* @package observium
* @subpackage discovery
* @copyright (C) 2006-2013 Adam Armstrong, (C) 2013-2021 Observium Limited
* @copyright (C) 2006-2013 Adam Armstrong, (C) 2013-2022 Observium Limited
*
*/
@ -101,10 +101,10 @@ if (!safe_empty($hrStorage)) {
}
}
if (is_numeric($index)) {
if (is_numeric($index) && $size != 0) {
discover_storage($valid['storage'], $device, $index, $fstype, $mib, $descr, $units, $size, $used, [ 'storage_hc' => $hc ]);
$dsk_done[$descr] = $descr;
$dsk_done[$descr] = $path;
}
unset($fstype, $descr, $size, $used, $units, $path, $dsk, $hc);
@ -136,7 +136,7 @@ if (!safe_empty($cache_discovery['ucd-snmp-mib'])) {
$used = $dsk['dskUsed'] * $units;
}
if (is_numeric($index)) {
if (is_numeric($index) && $size != 0) {
discover_storage($valid['storage'], $device, $index, $fstype, $mib, $descr, $units, $size, $used, [ 'storage_hc' => $hc ]);
}
unset($fstype, $descr, $size, $used, $units, $hc);

View File

@ -1,30 +0,0 @@
<?php
/**
* Observium
*
* This file is part of Observium.
*
* @package observium
* @subpackage discovery
* @copyright (C) 2006-2013 Adam Armstrong, (C) 2013-2019 Observium Limited
*
*/
// Note, this mountpoint '/ifs' also discovered in HOST-RESOURCES-MIB, but ignored
//ISILON-MIB::ifsTotalBytes.0 = Counter64: 71376260235264
//ISILON-MIB::ifsUsedBytes.0 = Counter64: 38523365810176
//ISILON-MIB::ifsAvailableBytes.0 = Counter64: 28651530510336
//ISILON-MIB::ifsFreeBytes.0 = Counter64: 32852894425088
$cache_discovery['ISILON-MIB'] = snmp_get_multi_oid($device, 'ifsTotalBytes.0 ifsUsedBytes.0', array(), 'ISILON-MIB');
if (is_array($cache_discovery['ISILON-MIB'][0]))
{
$hc = 1;
$size = $cache_discovery['ISILON-MIB'][0]['ifsTotalBytes'];
$used = $cache_discovery['ISILON-MIB'][0]['ifsUsedBytes'];
discover_storage($valid['storage'], $device, 0, 'volume', 'ISILON-MIB', '/ifs', 1, $size, $used, array('storage_hc' => $hc));
}
// EOF

View File

@ -1,98 +0,0 @@
<?php
/**
* Observium
*
* This file is part of Observium.
*
* @package observium
* @subpackage discovery
* @copyright (C) 2006-2013 Adam Armstrong, (C) 2013-2021 Observium Limited
*
*/
$cache_discovery['netapp-mib'] = snmpwalk_cache_oid($device, "dfEntry", array(), 'NETAPP-MIB');
if (safe_count($cache_discovery['netapp-mib'])) {
/*
Available data:
array(40) {
["dfIndex"]=> "3"
["dfFileSys"]=> "/vol/vol0/"
["dfKBytesTotal"]=> "158387408"
["dfKBytesUsed"]=> "7600652"
["dfKBytesAvail"]=> "150786756"
["dfPerCentKBytesCapacity"]=> "5"
["dfInodesUsed"]=> "9405"
["dfInodesFree"]=> "14517028"
["dfPerCentInodeCapacity"]=> "0"
["dfMountedOn"]=> "/vol/vol0/"
["dfMaxFilesAvail"]=> "14526433"
["dfMaxFilesUsed"]=> "9405"
["dfMaxFilesPossible"]=> "39596840"
["dfHighTotalKBytes"]=> "0"
["dfLowTotalKBytes"]=> "158387408"
["dfHighUsedKBytes"]=> "0"
["dfLowUsedKBytes"]=> "7600652"
["dfHighAvailKBytes"]=> "0"
["dfLowAvailKBytes"]=> "150786756"
["dfStatus"]=> "mounted"
["dfMirrorStatus"]=> "invalid"
["dfPlexCount"]=> "0"
["dfType"]=> "flexibleVolume"
["dfHighSisSharedKBytes"]=> "0"
["dfLowSisSharedKBytes"]=> "0"
["dfHighSisSavedKBytes"]=> "0"
["dfLowSisSavedKBytes"]=> "0"
["dfPerCentSaved"]=> "0"
["df64TotalKBytes"]=> "158387408"
["df64UsedKBytes"]=> "7600644"
["df64AvailKBytes"]=> "150786764"
["df64SisSharedKBytes"]=> "0"
["df64SisSavedKBytes"]=> "0"
["df64CompressSaved"]=> "0"
["dfCompressSavedPercent"]=> "0"
["df64DedupeSaved"]=> "0"
["dfDedupeSavedPercent"]=> "0"
["df64TotalSaved"]=> "0"
["dfTotalSavedPercent"]=> "0"
["df64TotalReservedKBytes"]=> "263724"
}
*/
foreach ($cache_discovery['netapp-mib'] as $index => $storage)
{
$fstype = $storage['dfType'];
$descr = $storage['dfFileSys'];
if (!empty($storage['dfVserver']))
{
// Add server info on cluster devices
$descr .= ' - ' . $storage['dfVserver'];
}
$deny = FALSE;
if (!$deny)
{
if (is_numeric($storage['df64TotalKBytes']))
{
$size = $storage['df64TotalKBytes'] * 1024;
$used = $storage['df64UsedKBytes'] * 1024;
$hc = 1;
} else {
$size = $storage['dfKBytesTotal'] * 1024;
$used = $storage['dfKBytesUsed'] * 1024;
$hc = 0;
}
if (is_numeric($index))
{
discover_storage($valid['storage'], $device, $index, $fstype, 'NETAPP-MIB', $descr, 1024, $size, $used, array('storage_hc' => $hc));
}
}
unset($deny, $fstype, $descr, $size, $used, $free, $percent, $hc);
}
unset($index, $storage);
}
// EOF

View File

@ -1,49 +0,0 @@
<?php
/**
* Observium
*
* This file is part of Observium.
*
* @package observium
* @subpackage discovery
* @copyright (C) 2006-2013 Adam Armstrong, (C) 2013-2019 Observium Limited
*
*/
$mib = 'NIMBLE-MIB';
//$cache_discovery[$mib]
$oids = snmpwalk_cache_oid($device, 'volName', array(), $mib);
if (count($oids))
{
foreach (array('volSizeLow', 'volSizeHigh', 'volUsageLow', 'volUsageHigh', 'volOnline') as $oid)
{
$oids = snmpwalk_cache_oid($device, $oid, $oids, $mib);
}
if (OBS_DEBUG > 1) { print_vars($oids); }
foreach ($oids as $index => $storage)
{
$hc = 1;
$fstype = 'volume';
$descr = $storage['volName'];
$units = 1048576; // Hardcode units. In MIB is written that bytes, but really Mbytes
// FIXME, probably need additional field for storages like OperStatus up/down
$ignore = in_array($storage['volOnline'], array('0', 'false')) ? 1 : 0;
$deny = FALSE;
$size = snmp_size64_high_low($storage['volSizeHigh'], $storage['volSizeLow']) * $units;
$used = snmp_size64_high_low($storage['volUsageHigh'], $storage['volUsageLow']) * $units;
if (!$deny && is_numeric($index))
{
discover_storage($valid['storage'], $device, $index, $fstype, $mib, $descr, $units, $size, $used, array('storage_hc' => $hc, 'storage_ignore' => $ignore));
}
}
}
unset($oids, $deny, $fstype, $descr, $size, $used, $units, $hc);
// EOF

View File

@ -1,5 +1,4 @@
<?php
/**
* Observium
*
@ -7,12 +6,12 @@
*
* @package observium
* @subpackage discovery
* @copyright (C) 2006-2013 Adam Armstrong, (C) 2013-2019 Observium Limited
* @copyright (C) 2006-2013 Adam Armstrong, (C) 2013-2022 Observium Limited
*
*/
// NOTE. Here only walking, because needed additional checks by HOST-RESOURCES-MIB (see host-resources-mib.inc.php in current directory)
$cache_discovery['ucd-snmp-mib'] = snmpwalk_cache_oid($device, 'dskEntry', array(), 'UCD-SNMP-MIB');
$cache_discovery['ucd-snmp-mib'] = snmpwalk_cache_oid($device, 'dskEntry', [], 'UCD-SNMP-MIB');
// EOF