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

remove cr between cdp&lldp, fix arp table, fix hr-device to poll les data.

Browse Source 
git-svn-id: http://www.observium.org/svn/observer/trunk@852 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong
2010-02-15 03:05:16 +00:00
parent 2440e1e284
commit 272b5a0a7e
5 changed files with 9 additions and 246 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
includes/discovery/arp-table.php
View File

@@ -3,7 +3,7 @@
echo("ARP Table : "); echo("ARP Table : ");
$ipNetToMedia_data = shell_exec(($device['snmpver'] == 'v1' ? $config['snmpwalk'] : $config['snmpbulkwalk']) . " -m IP-MIB -Oq -".$device['snmpver']." -c ".$device['community']." ".$device['hostname']." ipNetToMediaPhysAddress"); $ipNetToMedia_data = snmp_walk($device, 'ipNetToMediaPhysAddress', '-Oq', 'IP-MIB');
$ipNetToMedia_data = str_replace("ipNetToMediaPhysAddress.", "", trim($ipNetToMedia_data)); $ipNetToMedia_data = str_replace("ipNetToMediaPhysAddress.", "", trim($ipNetToMedia_data));
$ipNetToMedia_data = str_replace("IP-MIB::", "", trim($ipNetToMedia_data)); $ipNetToMedia_data = str_replace("IP-MIB::", "", trim($ipNetToMedia_data));
#echo("$ipNetToMedia_data\n"); #echo("$ipNetToMedia_data\n");

2
includes/discovery/cdp-lldp.inc.php
View File

@@ -55,8 +55,6 @@ if($debug) {echo("$lldp_links");}
$discovered_links = (isset($cdp_links) ? $cdp_links : '') . (isset($lldp_links) ? $lldp_links : ''); $discovered_links = (isset($cdp_links) ? $cdp_links : '') . (isset($lldp_links) ? $lldp_links : '');
echo "\n";
if($discovered_links != "\n") { if($discovered_links != "\n") {
foreach ( explode("\n" ,$discovered_links) as $link ) { foreach ( explode("\n" ,$discovered_links) as $link ) {
if ($link == "") { break; } if ($link == "") { break; }

12
includes/discovery/hr-device.inc.php
View File

@@ -2,13 +2,15 @@
echo("hrDevice : "); echo("hrDevice : ");
$hrDevice_oids = array('hrDeviceIndex','hrDeviceType','hrDeviceDescr','hrDeviceStatus','hrDeviceErrors','hrProcessorLoad'); $hrDevice_oids = array('hrDeviceEntry','hrProcessorEntry');
if($debug) {print_r($hrDevices);}
foreach ($hrDevice_oids as $oid) { $hrDevices = snmp_cache_oid($oid, $device, $hrDevices, "HOST-RESOURCES-MIB:HOST-RESOURCES-TYPES"); }
foreach ($hrDevice_oids as $oid) { $hrDevice_array = snmp_cache_oid($oid, $device, $hrDevice_array, "HOST-RESOURCES-MIB:HOST-RESOURCES-TYPES"); } if($debug) {print_r($hrDevices);}
foreach($hrDevice_array[$device['device_id']] as $hrDevice) { foreach($hrDevices[$device['device_id']] as $hrDevice) {
if(is_array($hrDevice)) { if(is_array($hrDevice) && is_numeric($hrDevice['hrDeviceIndex'])) {
if(mysql_result(mysql_query("SELECT COUNT(*) FROM `hrDevice` WHERE device_id = '".$device['device_id']."' AND hrDeviceIndex = '".$hrDevice['hrDeviceIndex']."'"),0)) { if(mysql_result(mysql_query("SELECT COUNT(*) FROM `hrDevice` WHERE device_id = '".$device['device_id']."' AND hrDeviceIndex = '".$hrDevice['hrDeviceIndex']."'"),0)) {
$update_query = "UPDATE `hrDevice` SET"; $update_query = "UPDATE `hrDevice` SET";
$update_query .= " `hrDeviceType` = '".mres($hrDevice[hrDeviceType])."'"; $update_query .= " `hrDeviceType` = '".mres($hrDevice[hrDeviceType])."'";
@@ -24,6 +26,7 @@ foreach($hrDevice_array[$device['device_id']] as $hrDevice) {
$insert_query = "INSERT INTO `hrDevice` (`hrDeviceIndex`,`device_id`,`hrDeviceType`,`hrDeviceDescr`,`hrDeviceStatus`,`hrDeviceErrors`) "; $insert_query = "INSERT INTO `hrDevice` (`hrDeviceIndex`,`device_id`,`hrDeviceType`,`hrDeviceDescr`,`hrDeviceStatus`,`hrDeviceErrors`) ";
$insert_query .= " VALUES ('".mres($hrDevice[hrDeviceIndex])."','".mres($device[device_id])."','".mres($hrDevice[hrDeviceType])."','".mres($hrDevice[hrDeviceDescr])."','".mres($hrDevice[hrDeviceStatus])."','".mres($hrDevice[hrDeviceErrors])."')"; $insert_query .= " VALUES ('".mres($hrDevice[hrDeviceIndex])."','".mres($device[device_id])."','".mres($hrDevice[hrDeviceType])."','".mres($hrDevice[hrDeviceDescr])."','".mres($hrDevice[hrDeviceStatus])."','".mres($hrDevice[hrDeviceErrors])."')";
@mysql_query($insert_query); $mysql++; echo("+"); @mysql_query($insert_query); $mysql++; echo("+");
if($debug) { print_r($hrDevice); echo("$insert_query" . mysql_affected_rows() . " row inserted"); }
} }
$valid_hrDevice[$hrDevice[hrDeviceIndex]] = 1; $valid_hrDevice[$hrDevice[hrDeviceIndex]] = 1;
} }
@@ -36,6 +39,7 @@ while ($test_hrDevice = mysql_fetch_array($query)) {
if(!$valid_hrDevice[$test_hrDevice[hrDeviceIndex]]) { if(!$valid_hrDevice[$test_hrDevice[hrDeviceIndex]]) {
echo("-"); echo("-");
mysql_query("DELETE FROM `hrDevice` WHERE hrDevice_id = '" . $test_hrDevice['hrDevice_id'] . "'"); mysql_query("DELETE FROM `hrDevice` WHERE hrDevice_id = '" . $test_hrDevice['hrDevice_id'] . "'");
if($debug) { print_r($test_hrDevice); echo(mysql_affected_rows() . " row deleted"); }
} }
} }

75
mibs/junos/.index
View File

@@ -1,75 +0,0 @@
JUNIPER-MAC-MIB mib-jnx-mac.txt
JUNIPER-SIP-COMMON-MIB mib-jnx-sipcommon.txt
JUNIPER-RMON-MIB mib-jnx-rmon.txt
JUNIPER-CHASSIS-DEFINES-MIB mib-jnx-chas-defines.txt
JNX-L2TP-MIB mib-jnx-l2tp.txt
JUNIPER-PFE-MIB mib-jnx-pfe.txt
JUNIPER-VIRTUALCHASSIS-MIB mib-jnx-virtualchassis.txt
JUNIPER-ANALYZER-MIB mib-jnx-analyzer.txt
JUNIPER-ATM-MIB mib-jnx-atm.txt
JUNIPER-IPSEC-FLOW-MON-MIB mib-jnx-ipsec-flow-mon.txt
JUNIPER-RPS-MIB mib-jnx-rps.txt
JUNIPER-COS-MIB mib-jnx-cos.txt
JUNIPER-SYSLOG-MIB mib-jnx-syslog.txt
JUNIPER-LDP-MIB mib-jnx-ldp.txt
JUNIPER-TRACEROUTE-MIB mib-jnx-traceroute.txt
JUNIPER-JS-IF-EXT-MIB mib-jnx-js-if-ext.txt
JUNIPER-BFD-MIB mib-jnx-bfd.txt
JUNIPER-MIMSTP-MIB mib-jnx-mimstp.txt
JUNIPER-UTIL-MIB mib-jnx-util.txt
JUNIPER-JS-IDP-MIB mib-jnx-js-idp.txt
JUNIPER-FIREWALL-MIB mib-jnx-firewall.txt
BGP4-V2-MIB-JUNIPER mib-jnx-bgpmib2.txt
JUNIPER-L2ALD-MIB mib-jnx-l2ald.txt
JUNIPER-COLLECTOR-MIB mib-jnx-coll.txt
JUNIPER-JS-NAT-MIB mib-jnx-js-nat.txt
JUNIPER-IPFORWARD-MIB mib-jnx-ipforward.txt
JUNIPER-JS-AUTH-MIB mib-jnx-js-auth.txt
JUNIPER-OTN-MIB mib-jnx-otn.txt
JUNIPER-IPv4-MIB mib-jnx-ipv4.txt
JUNIPER-DCU-MIB mib-jnx-dcu.txt
JUNIPER-EX-MAC-NOTIFICATION-MIB mib-jnx-ex-mac-notification.txt
JUNIPER-SP-MIB mib-jnx-sp.txt
JUNIPER-ALARM-MIB mib-jnx-chassis-alarm.txt
JUNIPER-EVENT-MIB mib-jnx-event.txt
JUNIPER-PW-TDM-MIB mib-jnx-pwtdm.txt
JUNIPER-IPv6-MIB mib-jnx-ipv6.txt
JUNIPER-CHASSIS-CLUSTER-MIB mib-jnx-jsrpd.txt
JUNIPER-SECURE-ACCESS-PORT-MIB mib-jnx-secure-access-port.txt
JUNIPER-PING-MIB mib-jnx-ping.txt
JUNIPER-IF-MIB mib-jnx-if-extensions.txt
JUNIPER-JS-IPSEC-VPN-MIB mib-jnx-js-ipsec-vpn.txt
JUNIPER-RPF-MIB mib-jnx-rpf.txt
JUNIPER-JS-SMI mib-jnx-js-smi.txt
JUNIPER-CHASSIS-FWDD-MIB mib-jnx-chassis-fwdd.txt
JUNIPER-MPLS-LDP-MIB mib-jnx-mpls-ldp.txt
JUNIPER-EX-SMI mib-jnx-ex-smi.txt
MPLS-MIB mib-jnx-mpls.txt
JUNIPER-PAE-EXTENSION-MIB mib-jnx-pae-extension.txt
JUNIPER-VLAN-MIB mib-jnx-vlan.txt
JUNIPER-JS-DNS-MIB mib-jnx-js-dns.txt
JUNIPER-RPM-MIB mib-jnx-rpm.txt
JUNIPER-HOSTRESOURCES-MIB mib-jnx-hostresources.txt
JUNIPER-MIB mib-jnx-chassis.txt
JUNIPER-ATM-COS-MIB mib-jnx-atm-cos.txt
JUNIPER-CFGMGMT-MIB mib-jnx-cfgmgmt.txt
JNX-IPSEC-MONITOR-MIB mib-jnx-ipsec-monitor-asp.txt
APS-MIB mib-jnx-sonetaps.txt
JUNIPER-EXPERIMENT-MIB mib-jnx-exp.txt
JUNIPER-USER-AAA-MIB mib-jnx-user-aaa.txt
JUNIPER-JS-POLICY-MIB mib-jnx-js-policy.txt
JUNIPER-JS-UTM-AV-MIB mib-jnx-js-utm-av.txt
JUNIPER-SMI mib-jnx-smi.txt
JUNIPER-VPN-MIB mib-jnx-vpn.txt
JUNIPER-DFC-MIB mib-jnx-dfc.txt
JUNIPER-RTM-MIB mib-jnx-rtm.txt
JUNIPER-SCU-MIB mib-jnx-scu.txt
JUNIPER-SONET-MIB mib-jnx-sonet.txt
OSPFV3-MIB-JUNIPER mib-jnx-ospfv3mib.txt
JUNIPER-PMon-MIB mib-jnx-pmon.txt
JUNIPER-RSVP-MIB mib-jnx-rsvp.txt
JUNIPER-SRX5000-SPU-MONITORING-MIB mib-jnx-js-spu-monitoring.txt
JUNIPER-JS-SCREENING-MIB mib-jnx-js-screening.txt
JUNIPER-L2CP-FEATURES-MIB mib-jnx-l2cp-features.txt
JUNIPER-JS-CERT-MIB mib-jnx-js-cert.txt
BFD-STD-MIB mib-jnx-bfd-exp.txt

164
mibs/junose/.index
View File

@@ -1,164 +0,0 @@
IPV6-TC mib-rfc2465tc.txt
PPVPN-TC-MIB mib-vpntcmib.txt
ATM-FORUM-MIB mib-ilmim.txt
RSTP-MIB mib-rfc4318.txt
SNMPv2-MIB mib-rfc1907.txt
Juniper-PPPOE-PROFILE-MIB juniPppoeProfile.mi2
IP-FORWARD-MIB mib-rtmib.txt
GMPLS-TE-STD-MIB mib-rfc4802.txt
IF-MIB mib-rfc2863a.txt
ISIS-MIB mib-isismib.txt
ADSL-TC-MIB mib-rfc2662tc.txt
Juniper-POLICY-MIB juniPolicy.mi2
Juniper-IGMP-MIB juniIgmp.mi2
FR-MFR-MIB mib-rfc3020.txt
Juniper-TC juniTc.mi2
Juniper-LICENSE-MIB juniLicense.mi2
HCNUM-TC mib-rfc2856a.txt
RMON-MIB mib-rfc2819a.txt
DS1-MIB mib-rfc2495a.txt
Juniper-ROUTER-MIB juniRouter.mi2
Juniper-ISIS-MIB juniIsIs.mi2
HOST-RESOURCES-MIB mib-rfc2790a.txt
P-BRIDGE-MIB mib-rfc4363a.txt
PerfHist-TC-MIB mib-rfc2493.txt
SYSAPPL-MIB mib-rfc2287a.txt
Juniper-ETHERNET-MIB juniEthernet.mi2
TCP-MIB mib-rfc2012a.txt
Juniper-DS3-MIB juniDs3.mi2
Juniper-DS1-MIB juniDs1.mi2
IANA-GMPLS-TC-MIB mib-IANA-GMPLS-TC-MIB.txt
Juniper-REDUNDANCY-MIB juniRedundancy.mi2
Juniper-BGP-MIB juniBgp.mi2
TRANSPORT-ADDRESS-MIB mib-rfc3419.txt
Juniper-IP-POLICY-MIB juniIpPolicy.mi2
Juniper-HDLC-MIB juniHdlc.mi2
PIM-MIB mib-pimmib.txt
Juniper-AAA-MIB juniAaa.mi2
Juniper-IPsec-Tunnel-MIB juniIpsecTunnel.mi2
Juniper-System-MIB juniSystem.mi2
RMON2-MIB mib-rfc4502.txt
Juniper-Products-MIB juniProducts.mi2
IANAifType-MIB mib-IANAifType-MIB.txt
Juniper-SNMP-MIB juniSnmp.mi2
DISMAN-TRACEROUTE-MIB mib-rfc2925b.txt
JUNIPER-EXPERIMENT-MIB jnxExperiment.mi2
OPT-IF-MIB mib-rfc3591.txt
LLDP-MIB mib-lldp.txt
Juniper-HTTP-Profile-MIB juniHttpProfile.mi2
SNMP-FRAMEWORK-MIB mib-rfc2571.txt
Juniper-RADIUS-CLIENT-MIB juniRadClient.mi2
ENTITY-MIB ENTITY-MIB.my
Juniper-Bridging-Manager-MIB juniBridgingMgr.mi2
UDP-MIB mib-rfc2013a.txt
VRRP-MIB mib-rfc2787a.txt
Juniper-DVMRP-MIB juniDvmrp.mi2
POWER-ETHERNET-MIB mib-rfc3621.txt
Juniper-PROFILE-MIB juniProfile.mi2
Juniper-ATM-1483-Profile-MIB juniAtmProfile.mi2
Juniper-ADDRESS-POOL-MIB juniAddrPool.mi2
ATM-MIB mib-rfc2515a.txt
Juniper-PPP-MIB juniPpp.mi2
Juniper-ES2-Registry juniEs2Registry.mi2
SNMPv2-SMI mib-SNMPv2-SMI.txt
SNMP-COMMUNITY-MIB mib-rfc2576.txt
Juniper-DHCP-MIB juniDhcp.mi2
SNMP-MPD-MIB mib-rfc2572.txt
OSPF-MIB mib-ospf2mib.txt
SNMP-TARGET-MIB mib-rfc3413target.txt
Juniper-IP-TUNNEL-MIB juniIpTunnel.mi2
ADSL-LINE-MIB mib-rfc2662.txt
Juniper-FILE-XFER-MIB juniFileXfer.mi2
Juniper-ERX-Registry juniErxRegistry.mi2
IPMROUTE-MIB mib-mroutemib.txt
Juniper-FRAME-RELAY-MIB juniFr.mi2
SNA-SDLC-MIB mib-rfc1747.txt
Juniper-System-Clock-MIB juniSystemClock.mi2
OSPF-TRAP-MIB mib-ospf2trap.txt
Juniper-UNI-SMI juniSmi.mi2
SONET-MIB mib-rfc3592.txt
Juniper-L2TP-MIB juniL2tp.mi2
Juniper-DHCPv6-MIB juniDhcpv6.mi2
ESO-CONSORTIUM-MIB mib-eso-consortium.txt
Juniper-IPV6-PROFILE-MIB juniIpv6Profile.mi2
Juniper-HOST-MIB juniHost.mi2
GMPLS-LSR-STD-MIB mib-rfc4803.txt
Juniper-DOS-PROTECTION-PLATFORM-MIB juniDosProtectionPlat.mi2
Juniper-QoS-MIB juniQos.mi2
Juniper-CLI-MIB juniCli.mi2
SNMPv2-TC mib-SNMPv2-TC.txt
Juniper-BRIDGE-MIB juniBridge.mi2
MPLS-TE-STD-MIB mib-rfc3812.txt
Juniper-SSC-CLIENT-MIB juniSscClient.mi2
Juniper-HTTP-MIB juniHttp.mi2
PTOPO-MIB mib-rfc2922.txt
Juniper-AUTOCONFIGURE-MIB juniAutoconf.mi2
DLSW-MIB mib-rfc2024a.txt
HOST-RESOURCES-TYPES mib-rfc2790type.txt
FRAME-RELAY-DTE-MIB mib-rfc2115a.txt
Juniper-MROUTER-MIB juniMRouter.mi2
Juniper-DISMAN-EVENT-MIB juniDismanEvent.mi2
JUNIPER-SMI jnxSmi.mi2
INET-ADDRESS-MIB mib-rfc2851.txt
IP-MIB mib-rfc2011a.txt
Juniper-PPPOE-MIB juniPppoe.mi2
Juniper-TSM-MIB juniTSM.mi2
Juniper-UNI-IF-MIB juniIf.mi2
Juniper-DNS-MIB juniDns.mi2
INTEGRATED-SERVICES-MIB mib-rfc2213.txt
IANA-RTPROTO-MIB mib-IANA-RTPROTO-MIB.txt
EtherLike-MIB mib-rfc2665a.txt
Juniper-FRACTIONAL-T1-MIB juniFt1.mi2
IEEE8021-PAE-MIB mib-ieee8021pae.txt
IGMP-STD-MIB mib-igmpmib.txt
BGP4-MIB mib-bgpmib.txt
Q-BRIDGE-MIB mib-rfc4363b.txt
Juniper-PPP-PROFILE-MIB juniPppProfile.mi2
DS3-MIB mib-rfc3896.txt
Juniper-RADIUS-Proxy-MIB juniRadProxy.mi2
IPV6-MIB mib-rfc2465.txt
DIFFSERV-MIB mib-rfc3289.txt
IPMROUTE-STD-MIB mib-rfc2932.txt
DVMRP-STD-MIB-JUNI draft-ietf-idmr-dvmrp-mib-11-juni.mi2
Juniper-ACCOUNTING-MIB juniAcctng.mi2
BRIDGE-MIB mib-rfc4188.txt
SNMP-PROXY-MIB mib-rfc3413.txt
TOKEN-RING-RMON-MIB mib-rfc1513.txt
GMPLS-TC-STD-MIB mib-rfc4801.txt
Juniper-SLEP-MIB juniSlep.mi2
Juniper-MIBs juniMibs.mi2
Juniper-IKE-MIB juniIke.mi2
SNMP-USER-BASED-SM-MIB mib-rfc2574.txt
Juniper-COPS-MIB juniCops.mi2
MPLS-TC-STD-MIB mib-rfc3811.txt
Juniper-DOS-PROTECTION-MIB juniDosProtection.mi2
DRAFT-MSDP-MIB mib-msdpmib.txt
Juniper-BRIDGE-ETHERNET-MIB juniBridgeEthernet.mi2
MPLS-LSR-STD-MIB mib-rfc3813.txt
IEEE8023-LAG-MIB mib-802.3ad.txt
MPLS-VPN-MIB mib-l3vpnmib.txt
Juniper-RADIUS-Initiated-Request-MIB juniRadRequest.mi2
Juniper-ERX-System-MIB juniErxSystem.mi2
Juniper-Experiment juniExperiment.mi2
Juniper-TACACS-Plus-Client-MIB juniTcsClient.mi2
Juniper-OSPF-MIB juniOspf.mi2
SNMPv2-TM mib-rfc3417.txt
ATM-TC-MIB mib-rfc2514.txt
Juniper-IP-PROFILE-MIB juniIpProfile.mi2
APS-MIB-JUNI draft-ietf-atommib-sonetaps-mib-05-juni.mi2
Juniper-PIM-MIB juniPim.mi2
DISMAN-PING-MIB mib-rfc2925a.txt
Juniper-UNI-SONET-MIB juniSonet.mi2
Juniper-IP-MIB juniIp.mi2
Juniper-UNI-ATM-MIB juniAtm.mi2
Juniper-PACKET-MIRROR-MIB juniPacketMirror.mi2
Juniper-SUBSCRIBER-MIB juniSubscriber.mi2
Juniper-V35-MIB juniV35.mi2
Juniper-L2TP-Dialout-MIB juniL2tpDialout.mi2
SNMP-NOTIFICATION-MIB mib-rfc3413notify.txt
BGP4-V2-MIB-JUNIPER draft-ietf-idr-bgp4-mibv2-03-jnx.mi2
Juniper-RADIUS-Disconnect-MIB juniRadDiscon.mi2
DIFFSERV-DSCP-TC mib-diffServDscp-tc.txt
SNMP-VIEW-BASED-ACM-MIB mib-rfc2575.txt
Juniper-Registry juniRegistry.mi2
Juniper-LOG-MIB juniLog.mi2