mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

cleanup some mac accounting stuff

Browse Source 
git-svn-id: http://www.observium.org/svn/observer/trunk@1085 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong
2010-05-02 20:32:34 +00:00
parent a40a1244bf
commit 3eba59c8ab
2 changed files with 24 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
includes/discovery/fanspeeds.inc.php
View File

@@ -27,8 +27,10 @@ if ($device['os'] == "linux")
$oid = ".1.3.6.1.4.1.2021.13.16.3.1.3.". $index;
$current = snmp_get($device, $oid, "-Oqv", "LM-SENSORS-MIB");
$descr = trim(str_ireplace("fan-", "", $descr));
discover_fan($device, $oid, $index, $type, $descr, $precision, NULL, NULL, $current);
$fan_exists[$type][$index] = 1;
if($current > '0' && $current < '500') {
discover_fan($device, $oid, $index, $type, $descr, $precision, NULL, NULL, $current);
$fan_exists[$type][$index] = 1;
}
}
}
}

32
includes/polling/cisco-mac-accounting.inc.php
View File

@@ -2,22 +2,28 @@
$cip_oids = array('cipMacHCSwitchedBytes', 'cipMacHCSwitchedPkts');
echo("Caching OID: ");
foreach ($cip_oids as $oid) { echo("$oid "); $array = snmp_cache_cip($oid, $device, $array, "CISCO-IP-STAT-MIB"); }
echo("\n");
$cip_array = array();
foreach ($cip_oids as $oid)
{
echo("$oid ");
$cip_array = snmp_cache_cip($oid, $device, $cip_array, "CISCO-IP-STAT-MIB");
}
$polled = time();
$mac_entries = 0;
$mac_accounting_query = mysql_query("SELECT * FROM `mac_accounting` as A, `ports` AS I where A.interface_id = I.interface_id AND I.device_id = '".$device['device_id']."'");
while ($acc = mysql_fetch_array($mac_accounting_query)) {
$mac_accounting_query = mysql_query("SELECT *, A.poll_time AS poll_time FROM `mac_accounting` as A, `ports` AS I where A.interface_id = I.interface_id AND I.device_id = '".$device['device_id']."'");
while ($acc = mysql_fetch_assoc($mac_accounting_query)) {
$device_id = $acc['device_id'];
$ifIndex = $acc['ifIndex'];
$mac = $acc['mac'];
if($array[$device_id][$ifIndex][$mac]) {
$polled_period = $polled - $acc['poll_time'];
$polled_period = $polled - $acc['poll_time'];
if($cip_array[$device_id][$ifIndex][$mac]) {
$update .= "`poll_time` = '".$polled."'";
$update .= ", `poll_prev` = '".$acc['poll_time']."'";
@@ -25,12 +31,12 @@ while ($acc = mysql_fetch_array($mac_accounting_query)) {
$mac_entries++;
$b_in = $array[$device_id][$ifIndex][$mac]['cipMacHCSwitchedBytes']['input'];
$b_out = $array[$device_id][$ifIndex][$mac]['cipMacHCSwitchedBytes']['output'];
$p_in = $array[$device_id][$ifIndex][$mac]['cipMacHCSwitchedPkts']['input'];
$p_out = $array[$device_id][$ifIndex][$mac]['cipMacHCSwitchedPkts']['output'];
$b_in = $cip_array[$device_id][$ifIndex][$mac]['cipMacHCSwitchedBytes']['input'];
$b_out = $cip_array[$device_id][$ifIndex][$mac]['cipMacHCSwitchedBytes']['output'];
$p_in = $cip_array[$device_id][$ifIndex][$mac]['cipMacHCSwitchedPkts']['input'];
$p_out = $cip_array[$device_id][$ifIndex][$mac]['cipMacHCSwitchedPkts']['output'];
$this_ma = &$array[$device_id][$ifIndex][$mac];
$this_ma = &$cip_array[$device_id][$ifIndex][$mac];
/// Update metrics
foreach ($cip_oids as $oid) {
@@ -80,6 +86,8 @@ while ($acc = mysql_fetch_array($mac_accounting_query)) {
}
}
if($mac_entries) { echo("$mac_entries mac accounting entries updated\n"); }
unset($cip_array);
if($mac_entries) { echo(" $mac_entries MAC accounting entries\n"); }
?>