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

ignore adsl stats out of sanity (3.2KdB SNR? GET FUCKED CISCO.) Clean up legend for generic_multi_line. Add CISCO-VPDN-MGMT MIBs

Browse Source 
git-svn-id: http://www.observium.org/svn/observer/trunk@2694 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong
2011-10-21 10:54:06 +00:00
parent 12824ab8ac
commit 634e944987
6 changed files with 3356 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
html/includes/graphs/generic_multi_line.inc.php
View File

@@ -15,11 +15,11 @@ $unit_text = str_pad(truncate($unit_text,$unitlen),$unitlen);
if($width > "500")
{
$rrd_options .= " COMMENT:'".substr(str_pad($unit_text, $descr_len+5),0,$descr_len+5)." Current Average Maximum '";
$rrd_options .= " COMMENT:'".substr(str_pad($unit_text, $descr_len+5),0,$descr_len+5)."Now Min Max Avg\l'";
if (!$nototal) { $rrd_options .= " COMMENT:'Total '"; }
$rrd_options .= " COMMENT:'\l'";
} else {
$rrd_options .= " COMMENT:'".substr(str_pad($unit_text, $descr_len+5),0,$descr_len+5)."Now Ave Max Avg\l'";
$rrd_options .= " COMMENT:'".substr(str_pad($unit_text, $descr_len+5),0,$descr_len+5)."Now Min Max Avg\l'";
}

2
html/pages/device/ports/adsl.inc.php
View File

@@ -5,7 +5,7 @@
echo("<tr><th>Port</th><th>Traffic</th><th>Sync Speed</th><th>Attainable Speed</th><th>Attenuation</th><th>SNR Margin</th><th>Output Powers</th></tr>");
$i = "0";
$ports = dbFetchRows("select * from `ports` AS P, `ports_adsl` AS A WHERE P.device_id = ? AND A.interface_id = P.interface_id AND P.deleted = '0' ORDER BY `ifIndex` ASC", array($device['device_id']));
foreach ($ports as $interface)
foreach ($ports as $port)
{
include("includes/print-interface-adsl.inc.php");
$i++;

17
includes/polling/port-adsl.inc.php
View File

@@ -48,14 +48,14 @@ if (isset($port_stats[$port['ifIndex']]['adslLineCoding']))
$rrdfile = $config['rrd_dir'] . "/" . $device['hostname'] . "/" . safename("port-".$port['ifIndex']."-adsl.rrd");
$rrd_create = " --step 300";
$rrd_create .= " DS:AtucCurrSnrMgn:GAUGE:600:0:U";
$rrd_create .= " DS:AtucCurrAtn:GAUGE:600:0:U";
$rrd_create .= " DS:AtucCurrOutputPwr:GAUGE:600:0:U";
$rrd_create .= " DS:AtucCurrSnrMgn:GAUGE:600:0:635";
$rrd_create .= " DS:AtucCurrAtn:GAUGE:600:0:635";
$rrd_create .= " DS:AtucCurrOutputPwr:GAUGE:600:0:635";
$rrd_create .= " DS:AtucCurrAttainableR:GAUGE:600:0:U";
$rrd_create .= " DS:AtucChanCurrTxRate:GAUGE:600:0:U";
$rrd_create .= " DS:AturCurrSnrMgn:GAUGE:600:0:U";
$rrd_create .= " DS:AturCurrAtn:GAUGE:600:0:U";
$rrd_create .= " DS:AturCurrOutputPwr:GAUGE:600:0:U";
$rrd_create .= " DS:AturCurrSnrMgn:GAUGE:600:0:635";
$rrd_create .= " DS:AturCurrAtn:GAUGE:600:0:635";
$rrd_create .= " DS:AturCurrOutputPwr:GAUGE:600:0:635";
$rrd_create .= " DS:AturCurrAttainableR:GAUGE:600:0:U";
$rrd_create .= " DS:AturChanCurrTxRate:GAUGE:600:0:U";
$rrd_create .= " DS:AtucPerfLofs:COUNTER:600:U:100000000000";
@@ -101,13 +101,16 @@ if (isset($port_stats[$port['ifIndex']]['adslLineCoding']))
}
dbUpdate($port['adsl_update'], 'ports_adsl', '`interface_id` = ?', array($port['interface_id']));
if($this_port['adslAtucCurrSnrMgn'] > "1280") { $this_port['adslAtucCurrSnrMgn'] = "U"; }
if($this_port['adslAturCurrSnrMgn'] > "1280") { $this_port['adslAturCurrSnrMgn'] = "U"; }
$rrdupdate = "N";
foreach ($adsl_oids as $oid)
{
$oid = "adsl".$oid;
$data = str_replace("\"", "", $this_port[$oid]);
## Set data to be "unknown" if it's garbled, unexistant or zero
if (!is_numeric($data)) { $data = "0"; }
if (!is_numeric($data)) { $data = "U"; }
$rrdupdate .= ":$data";
}

586
mibs/CISCO-VPDN-MGMT-EXT-MIB Normal file
View File

@@ -0,0 +1,586 @@
-- *****************************************************************
-- CISCO-VPDN-MGMT-EXT-MIB.my: Vpdn Management Extension MIB file
--
-- April 1999, Junming Gao
--
-- Copyright (c) 1999, 2007 by cisco Systems Inc.
-- All rights reserved.
-- ****************************************************************
CISCO-VPDN-MGMT-EXT-MIB DEFINITIONS ::= BEGIN
IMPORTS
MODULE-IDENTITY,
OBJECT-TYPE,
TimeTicks,
Integer32,
Counter32
FROM SNMPv2-SMI
MODULE-COMPLIANCE,
OBJECT-GROUP
FROM SNMPv2-CONF
DisplayString,
TruthValue
FROM SNMPv2-TC
cvpdnTunnelAttrEntry,
cvpdnSessionAttrEntry
FROM CISCO-VPDN-MGMT-MIB
ciscoExperiment
FROM CISCO-SMI;
ciscoVpdnMgmtExtMIB MODULE-IDENTITY
LAST-UPDATED "200706040000Z"
ORGANIZATION "Cisco Systems, Inc."
CONTACT-INFO
"Cisco Systems
Customer Service
Postal: 170 W Tasman Drive
San Jose, CA 95134
USA
Tel: +1 800 553-NETS
E-mail: cs-vpdn@cisco.com"
DESCRIPTION
"Cisco VPDN management MIB extension Module.
This MIB is a supplement to CISCO-VPDN-MGMT-MIB.my.
The main enhancements are:
1. Added cvpdnTunnelExtTable for more tunnel information.
2. Added cvpdnSessionExtTable for more session information.
Please notice that objects in CvpdnTunnelEntry and
CvpdnTunnelSessionEntry are still applicable to the
corresponding tunnels and sessions."
REVISION "200706040000Z"
DESCRIPTION
"Corrected the format of LAST-UPDATED and REVISION fields."
REVISION "199904140000Z"
DESCRIPTION
"Original version of this MIB."
::= { ciscoExperiment 51 }
ciscoVpdnMgmtExtMIBObjects OBJECT IDENTIFIER
::= { ciscoVpdnMgmtExtMIB 1 }
cvpdnTunnelExtInfo OBJECT IDENTIFIER
::= { ciscoVpdnMgmtExtMIBObjects 1 }
cvpdnSessionExtInfo OBJECT IDENTIFIER
::= { ciscoVpdnMgmtExtMIBObjects 2 }
-- VPDN Tunnel Information Extension
cvpdnTunnelExtTable OBJECT-TYPE
SYNTAX SEQUENCE OF CvpdnTunnelExtEntry
MAX-ACCESS not-accessible
STATUS current
DESCRIPTION
"Vpn Tunnel table includes all tunnels configured."
::= { cvpdnTunnelExtInfo 1 }
cvpdnTunnelExtEntry OBJECT-TYPE
SYNTAX CvpdnTunnelExtEntry
MAX-ACCESS not-accessible
STATUS current
DESCRIPTION
"Please notice that this entry is a supplement to
CvpdnTunnelEntry in CISCO-VPDN-MGMT-MIB for the
L2TP tunnels. Here more objects are used to
reflect tunnel parameters. Included are tunnel
statistics, UDP port numbers and the time of last
state (cvpdnTunnelState) change."
AUGMENTS { cvpdnTunnelAttrEntry }
::= { cvpdnTunnelExtTable 1 }
CvpdnTunnelExtEntry ::= SEQUENCE {
cvpdnTunnelLocalPort Integer32,
cvpdnTunnelRemotePort Integer32,
cvpdnTunnelLastChange TimeTicks,
cvpdnTunnelPacketsOut Counter32,
cvpdnTunnelBytesOut Counter32,
cvpdnTunnelPacketsIn Counter32,
cvpdnTunnelBytesIn Counter32
}
cvpdnTunnelLocalPort OBJECT-TYPE
SYNTAX Integer32 (0..2147483647 )
MAX-ACCESS read-only
STATUS current
DESCRIPTION
"The local port number of the tunnel. This is the UDP port
of the interface at the local end of the tunnel."
::= { cvpdnTunnelExtEntry 1 }
cvpdnTunnelRemotePort OBJECT-TYPE
SYNTAX Integer32 (0..2147483647 )
MAX-ACCESS read-only
STATUS current
DESCRIPTION
"The remote port number of the tunnel. This is the UDP port
of the interface at the remote end of the tunnel."
::= { cvpdnTunnelExtEntry 2 }
cvpdnTunnelLastChange OBJECT-TYPE
SYNTAX TimeTicks
MAX-ACCESS read-only
STATUS current
DESCRIPTION
"The time of last state change reflected in cvpdnTunnelState."
::= { cvpdnTunnelExtEntry 3 }
cvpdnTunnelPacketsOut OBJECT-TYPE
SYNTAX Counter32
UNITS "packets"
MAX-ACCESS read-only
STATUS current
DESCRIPTION
"The total number of output packets through the tunnel."
::= { cvpdnTunnelExtEntry 4 }
cvpdnTunnelBytesOut OBJECT-TYPE
SYNTAX Counter32
UNITS "bytes"
MAX-ACCESS read-only
STATUS current
DESCRIPTION
"The total number of output bytes through the tunnel."
::= { cvpdnTunnelExtEntry 5 }
cvpdnTunnelPacketsIn OBJECT-TYPE
SYNTAX Counter32
UNITS "packets"
MAX-ACCESS read-only
STATUS current
DESCRIPTION
"The total number of input packets through the tunnel."
::= { cvpdnTunnelExtEntry 6 }
cvpdnTunnelBytesIn OBJECT-TYPE
SYNTAX Counter32
UNITS "bytes"
MAX-ACCESS read-only
STATUS current
DESCRIPTION
"The total number of input bytes through the tunnel."
::= { cvpdnTunnelExtEntry 7 }
cvpdnSessionExtTable OBJECT-TYPE
SYNTAX SEQUENCE OF CvpdnSessionExtEntry
MAX-ACCESS not-accessible
STATUS current
DESCRIPTION
"Session table includes all Sessions currently active."
::= { cvpdnSessionExtInfo 1 }
cvpdnSessionExtEntry OBJECT-TYPE
SYNTAX CvpdnSessionExtEntry
MAX-ACCESS not-accessible
STATUS current
DESCRIPTION
"Please notice that this entry is a supplement to
CvpdnTunnelSessionEntry in CISCO-VPDN-MGMT-MIB
for the L2TP sessions. Here more objects are
used to reflect session parameters."
AUGMENTS { cvpdnSessionAttrEntry }
::= { cvpdnSessionExtTable 1 }
CvpdnSessionExtEntry ::= SEQUENCE {
cvpdnSessionRemoteId Integer32,
cvpdnSessionInterfaceName DisplayString,
cvpdnSessionLastChange TimeTicks,
cvpdnSessionOutOfOrderPackets Counter32,
cvpdnSessionSequencing TruthValue,
cvpdnSessionSendSequence Integer32,
cvpdnSessionRecvSequence Integer32,
cvpdnSessionRemoteSendSequence Integer32,
cvpdnSessionRemoteRecvSequence Integer32,
cvpdnSessionSentZLB Counter32,
cvpdnSessionRecvZLB Counter32,
cvpdnSessionSentRBits Counter32,
cvpdnSessionRecvRBits Counter32,
cvpdnSessionLocalWindowSize Integer32,
cvpdnSessionRemoteWindowSize Integer32,
cvpdnSessionCurrentWindowSize Integer32,
cvpdnSessionMinimumWindowSize Integer32,
cvpdnSessionATOTimeouts Integer32,
cvpdnSessionOutGoingQueueSize Integer32,
cvpdnSessionCalculationType INTEGER ,
cvpdnSessionAdaptiveTimeOut Integer32,
cvpdnSessionRoundTripTime Integer32,
cvpdnSessionPktProcessingDelay Integer32,
cvpdnSessionZLBTime Integer32
}
cvpdnSessionRemoteId OBJECT-TYPE
SYNTAX Integer32 (0..2147483647 )
MAX-ACCESS read-only
STATUS current
DESCRIPTION
"The remote end ID of an active VPN tunnel user session."
::= { cvpdnSessionExtEntry 1 }
cvpdnSessionInterfaceName OBJECT-TYPE
SYNTAX DisplayString (SIZE (1..255))
MAX-ACCESS read-only
STATUS current
DESCRIPTION
"The interface name (description) of the user session."
::= { cvpdnSessionExtEntry 2 }
cvpdnSessionLastChange OBJECT-TYPE
SYNTAX TimeTicks
MAX-ACCESS read-only
STATUS current
DESCRIPTION
"The time stamp of last change in cvpdnTunnelSessionState."
::= { cvpdnSessionExtEntry 3 }
cvpdnSessionOutOfOrderPackets OBJECT-TYPE
SYNTAX Counter32
UNITS "packets"
MAX-ACCESS read-only
STATUS current
DESCRIPTION
"The total number of out of order packets through
this active user session."
::= { cvpdnSessionExtEntry 4 }
cvpdnSessionSequencing OBJECT-TYPE
SYNTAX TruthValue
MAX-ACCESS read-only
STATUS current
DESCRIPTION
"The object indicates whether sequencing is on or not."
::= { cvpdnSessionExtEntry 5 }
cvpdnSessionSendSequence OBJECT-TYPE
SYNTAX Integer32 (0..2147483647 )
MAX-ACCESS read-only
STATUS current
DESCRIPTION
"This object contains the next send sequence number
for for this session."
::= { cvpdnSessionExtEntry 6 }
cvpdnSessionRecvSequence OBJECT-TYPE
SYNTAX Integer32 (0..2147483647 )
MAX-ACCESS read-only
STATUS current
DESCRIPTION
"This object contains the next receive sequence
number expected to be received on this session."
::= { cvpdnSessionExtEntry 7 }
cvpdnSessionRemoteSendSequence OBJECT-TYPE
SYNTAX Integer32 (0..2147483647 )
MAX-ACCESS read-only
STATUS current
DESCRIPTION
"This object contains the next send sequence number
for for this session."
::= { cvpdnSessionExtEntry 8 }
cvpdnSessionRemoteRecvSequence OBJECT-TYPE
SYNTAX Integer32 (0..2147483647 )
MAX-ACCESS read-only
STATUS current
DESCRIPTION
"This object contains the next receive sequence
number expected to be received on this session."
::= { cvpdnSessionExtEntry 9 }
cvpdnSessionSentZLB OBJECT-TYPE
SYNTAX Counter32
MAX-ACCESS read-only
STATUS current
DESCRIPTION
"This object returns the total number of Zero
Length Body acknowledgement packets transmitted
on this session."
::= { cvpdnSessionExtEntry 10 }
cvpdnSessionRecvZLB OBJECT-TYPE
SYNTAX Counter32
MAX-ACCESS read-only
STATUS current
DESCRIPTION
"This object returns the total number of Zero Length
Body acknowlegement payload packets received for
this session."
::= { cvpdnSessionExtEntry 11 }
cvpdnSessionSentRBits OBJECT-TYPE
SYNTAX Counter32
MAX-ACCESS read-only
STATUS current
DESCRIPTION
"This object contains the total number of sequence
number resets (payload packets with the R-bit set)
received on this session."
::= { cvpdnSessionExtEntry 12 }
cvpdnSessionRecvRBits OBJECT-TYPE
SYNTAX Counter32
MAX-ACCESS read-only
STATUS current
DESCRIPTION
"This object contains the total number of sequence
number resets (payload packets with the R-bit set)
received on this session."
::= { cvpdnSessionExtEntry 13 }
cvpdnSessionLocalWindowSize OBJECT-TYPE
SYNTAX Integer32 (0..2147483647 )
MAX-ACCESS read-only
STATUS current
DESCRIPTION
"This object returns the local send window size
for this session. If the value of the object
cvpdnSessionSequencing is false,
then this object should return value zero."
::= { cvpdnSessionExtEntry 14 }
cvpdnSessionRemoteWindowSize OBJECT-TYPE
SYNTAX Integer32 (0..2147483647 )
MAX-ACCESS read-only
STATUS current
DESCRIPTION
"This object returns the initial remote send
window size for this session. If the value
of the object cvpdnSessionSequencingState
is none(1) then this object should not be
interpreted."
::= { cvpdnSessionExtEntry 15 }
cvpdnSessionCurrentWindowSize OBJECT-TYPE
SYNTAX Integer32 (0..2147483647 )
MAX-ACCESS read-only
STATUS current
DESCRIPTION
"This object returns the local send window size
for this session. If the value of the object
cvpdnSessionSequencingState is none(1)
then this object should not be interpreted."
::= { cvpdnSessionExtEntry 16 }
cvpdnSessionMinimumWindowSize OBJECT-TYPE
SYNTAX Integer32 (0..2147483647 )
MAX-ACCESS read-only
STATUS current
DESCRIPTION
"This object returns the initial remote send
window size for this session. If the value
of the object cvpdnSessionSequencingState
is none(1) then this object should not be
interpreted."
::= { cvpdnSessionExtEntry 17 }
cvpdnSessionATOTimeouts OBJECT-TYPE
SYNTAX Integer32 (0..2147483647 )
UNITS "msecs"
MAX-ACCESS read-only
STATUS current
DESCRIPTION
"The object reflects the current adaptive timeout
the system is using."
::= { cvpdnSessionExtEntry 18 }
cvpdnSessionOutGoingQueueSize OBJECT-TYPE
SYNTAX Integer32 (0..2147483647 )
MAX-ACCESS read-only
STATUS current
DESCRIPTION
"The object reflects the queue size of out going queue."
::= { cvpdnSessionExtEntry 19 }
cvpdnSessionCalculationType OBJECT-TYPE
SYNTAX INTEGER {
manual(1),
adaptive(2)
}
MAX-ACCESS read-only
STATUS current
DESCRIPTION
"The object reflects the round trip time calculation type."
::= { cvpdnSessionExtEntry 20 }
cvpdnSessionAdaptiveTimeOut OBJECT-TYPE
SYNTAX Integer32 (0..2147483647 )
UNITS "msecs"
MAX-ACCESS read-only
STATUS current
DESCRIPTION
"The object reflects the configured session adaptive timeout."
::= { cvpdnSessionExtEntry 21 }
cvpdnSessionRoundTripTime OBJECT-TYPE
SYNTAX Integer32 (0..2147483647 )
UNITS "msecs"
MAX-ACCESS read-only
STATUS current
DESCRIPTION
"The object reflects the round trip time."
::= { cvpdnSessionExtEntry 22 }
cvpdnSessionPktProcessingDelay OBJECT-TYPE
SYNTAX Integer32 (0..2147483647 )
UNITS "packets"
MAX-ACCESS read-only
STATUS current
DESCRIPTION
"The object reflects the number of packets in
processing delay for this session."
::= { cvpdnSessionExtEntry 23 }
cvpdnSessionZLBTime OBJECT-TYPE
SYNTAX Integer32 (0..2147483647 )
UNITS "msecs"
MAX-ACCESS read-only
STATUS current
DESCRIPTION
"The object reflects the zero length body time interval."
::= { cvpdnSessionExtEntry 24 }
-- Notifications
ciscoVpdnMgtExtMIBNotificationPrefix OBJECT IDENTIFIER
::= { ciscoVpdnMgmtExtMIB 2 }
-- Conformance
ciscoVpdnMgmtExtMIBConformance OBJECT IDENTIFIER
::= { ciscoVpdnMgmtExtMIB 3 }
ciscoVpdnMgmtExtMIBCompliances OBJECT IDENTIFIER
::= { ciscoVpdnMgmtExtMIBConformance 1 }
ciscoVpdnMgmtExtMIBGroups OBJECT IDENTIFIER
::= { ciscoVpdnMgmtExtMIBConformance 2 }
-- Compliance
ciscoVpdnMgmtExtMIBBasicCompliance MODULE-COMPLIANCE
STATUS current
DESCRIPTION
"The compliance statement for entities which implement
the Cisco VPN Management MIB."
MODULE -- this module
MANDATORY-GROUPS {
cvpdnTunnelExtGroup,
cvpdnSessionExtGroup
}
::= { ciscoVpdnMgmtExtMIBCompliances 1 }
-- UNITS of Conformance
cvpdnTunnelExtGroup OBJECT-GROUP
OBJECTS {
cvpdnTunnelLocalPort,
cvpdnTunnelRemotePort,
cvpdnTunnelLastChange,
cvpdnTunnelPacketsIn,
cvpdnTunnelPacketsOut,
cvpdnTunnelBytesIn,
cvpdnTunnelBytesOut
}
STATUS current
DESCRIPTION
"VPN Tunnel Group."
::= { ciscoVpdnMgmtExtMIBGroups 1 }
cvpdnSessionExtGroup OBJECT-GROUP
OBJECTS {
cvpdnSessionRemoteId,
cvpdnSessionInterfaceName,
cvpdnSessionLastChange,
cvpdnSessionSequencing,
cvpdnSessionSendSequence,
cvpdnSessionRecvSequence,
cvpdnSessionRemoteSendSequence,
cvpdnSessionRemoteRecvSequence,
cvpdnSessionOutOfOrderPackets,
cvpdnSessionSentZLB,
cvpdnSessionRecvZLB,
cvpdnSessionSentRBits,
cvpdnSessionRecvRBits,
cvpdnSessionLocalWindowSize,
cvpdnSessionRemoteWindowSize,
cvpdnSessionCurrentWindowSize,
cvpdnSessionMinimumWindowSize,
cvpdnSessionATOTimeouts,
cvpdnSessionOutGoingQueueSize,
cvpdnSessionCalculationType,
cvpdnSessionAdaptiveTimeOut,
cvpdnSessionRoundTripTime,
cvpdnSessionPktProcessingDelay,
cvpdnSessionZLBTime
}
STATUS current
DESCRIPTION
"VPDP Session Group."
::= { ciscoVpdnMgmtExtMIBGroups 2 }
END

2755
mibs/CISCO-VPDN-MGMT-MIB Normal file
View File

File diff suppressed because it is too large Load Diff