fix zyxel bullshit (we now have custom mibs, beware) fix DNS-SERVER-MIB and DNS-RESOLVER-MIB (from fenner's site) fix Juniper WX mibs (removed some comments which were breaking the compile)

git-svn-id: http://www.observium.org/svn/observer/trunk@1578 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong
2010-07-31 17:34:12 +00:00
parent a4ef7f5506
commit 8c27510edb
8 changed files with 1098 additions and 2312 deletions

View File

File diff suppressed because it is too large Load Diff

View File

@@ -1,8 +1,13 @@
-- extracted from rfc1611.txt
-- at Mon Nov 15 17:11:53 1999
DNS-SERVER-MIB DEFINITIONS ::= BEGIN
IMPORTS
mib-2
FROM RFC-1213
MODULE-IDENTITY, OBJECT-TYPE, OBJECT-IDENTITY,
IpAddress, Counter32, Gauge32, mib-2
IpAddress, Counter32, Gauge32
FROM SNMPv2-SMI
TEXTUAL-CONVENTION, RowStatus, DisplayString, TruthValue
FROM SNMPv2-TC
@@ -51,6 +56,7 @@
dnsServOptCounter OBJECT IDENTIFIER ::= { dnsServMIBObjects 3 }
dnsServZone OBJECT IDENTIFIER ::= { dnsServMIBObjects 4 }
-- Textual conventions
DnsName ::= TEXTUAL-CONVENTION
@@ -89,7 +95,6 @@
to DNS names.
Note that it is theoretically possible for a valid DNS
name to exceed the allowed length of an SNMP object
identifer, and thus be impossible to represent in tables
in this MIB that are indexed by DNS name. Sampling of
@@ -161,6 +166,7 @@
"RFC-1035."
SYNTAX Gauge32
DnsOpCode ::= TEXTUAL-CONVENTION
STATUS current
DESCRIPTION
@@ -230,7 +236,6 @@
SYNTAX DnsTime
MAX-ACCESS read-only
STATUS current
DESCRIPTION
"If the server has a persistent state (e.g., a process)
and supports a `reset' operation (e.g., can be told to
@@ -260,6 +265,7 @@
running(4) - server currently running."
::= { dnsServConfig 5 }
-- Server Counter Group
dnsServCounterAuthAns OBJECT-TYPE
@@ -327,7 +333,6 @@
dnsServCounterRelNames OBJECT-TYPE
SYNTAX Counter32
MAX-ACCESS read-only
STATUS current
DESCRIPTION
@@ -376,7 +381,6 @@
STATUS current
DESCRIPTION
"This table contains count information for each DNS class
and type value known to the server. The index allows
management software to to create indices to the table to
get the specific information desired, e.g., number of
@@ -517,7 +521,6 @@
DESCRIPTION
"Number of requests the server has processed which
originated from a resolver on the same host for which
there has been an authoritative answer."
::= { dnsServOptCounter 1 }
@@ -566,7 +569,6 @@
dnsServOptCounterSelfReferrals OBJECT-TYPE
SYNTAX Counter32
MAX-ACCESS read-only
STATUS current
DESCRIPTION
@@ -664,7 +666,6 @@
"Number of queries originating from friends which were
non-authoritatively answered (cached data). The
definition of friends is a locally defined matter."
::= { dnsServOptCounter 15 }
dnsServOptCounterFriendsNonAuthNoDatas OBJECT-TYPE
@@ -713,7 +714,6 @@
dnsServOptCounterFriendsReqRefusals OBJECT-TYPE
SYNTAX Counter32
MAX-ACCESS read-only
STATUS current
DESCRIPTION
"Number of DNS requests refused by the server which were
@@ -738,6 +738,7 @@
server errors and which originated from `friends'."
::= { dnsServOptCounter 22 }
-- Server Zone Group
-- DNS Management Zone Configuration Table
@@ -761,7 +762,6 @@
dnsServZoneEntry OBJECT-TYPE
SYNTAX DnsServZoneEntry
MAX-ACCESS not-accessible
STATUS current
DESCRIPTION
"An entry in the name server zone table. New rows may be
@@ -810,7 +810,6 @@
STATUS current
DESCRIPTION
"DNS class of the RRs in this zone."
::= { dnsServZoneEntry 2 }
dnsServZoneLastReloadSuccess OBJECT-TYPE
@@ -859,7 +858,6 @@
STATUS current
DESCRIPTION
"Zone serial number (from the SOA RR) of the zone
represented by this row of the table. If the zone has
not been successfully loaded within the memory of this
name server, the value of this variable is zero."
@@ -908,7 +906,6 @@
dnsServZoneSrcEntry OBJECT-TYPE
SYNTAX DnsServZoneSrcEntry
MAX-ACCESS not-accessible
STATUS current
DESCRIPTION
"An entry in the name server zone source table."
@@ -957,13 +954,13 @@
dnsServZoneSrcStatus OBJECT-TYPE
SYNTAX RowStatus
MAX-ACCESS read-create
STATUS current
DESCRIPTION
"The status of the information represented in this row of
the table."
::= { dnsServZoneSrcEntry 4 }
-- SNMPv2 groups.
dnsServMIBGroups OBJECT IDENTIFIER ::= { dnsServMIB 2 }
@@ -991,14 +988,13 @@
dnsServCounterRelNames,
dnsServCounterReqRefusals,
dnsServCounterReqUnparses,
dnsServCounterOtherErrors
--dnsServCounterOpCode,
--dnsServCounterQClass,
--dnsServCounterQType,
--dnsServCounterTransport,
--dnsServCounterRequests,
--dnsServCounterResponses
}
dnsServCounterOtherErrors,
dnsServCounterOpCode,
dnsServCounterQClass,
dnsServCounterQType,
dnsServCounterTransport,
dnsServCounterRequests,
dnsServCounterResponses }
STATUS current
DESCRIPTION
"A collection of objects providing basic instrumentation
@@ -1034,25 +1030,25 @@
instrumentation of a DNS name server."
::= { dnsServMIBGroups 3 }
-- dnsServZoneGroup OBJECT-GROUP
-- OBJECTS { dnsServZoneName,
-- dnsServZoneClass,
-- dnsServZoneLastReloadSuccess,
-- dnsServZoneLastReloadAttempt,
-- dnsServZoneLastSourceAttempt,
-- dnsServZoneLastSourceSuccess,
-- dnsServZoneStatus,
-- dnsServZoneSerial,
-- dnsServZoneCurrent,
-- dnsServZoneSrcName,
-- dnsServZoneSrcClass,
-- dnsServZoneSrcAddr,
-- dnsServZoneSrcStatus }
-- STATUS current
-- DESCRIPTION
-- "A collection of objects providing configuration control
-- of a DNS name server which loads authoritative zones."
-- ::= { dnsServMIBGroups 4 }
dnsServZoneGroup OBJECT-GROUP
OBJECTS { dnsServZoneName,
dnsServZoneClass,
dnsServZoneLastReloadSuccess,
dnsServZoneLastReloadAttempt,
dnsServZoneLastSourceAttempt,
dnsServZoneLastSourceSuccess,
dnsServZoneStatus,
dnsServZoneSerial,
dnsServZoneCurrent,
dnsServZoneSrcName,
dnsServZoneSrcClass,
dnsServZoneSrcAddr,
dnsServZoneSrcStatus }
STATUS current
DESCRIPTION
"A collection of objects providing configuration control
of a DNS name server which loads authoritative zones."
::= { dnsServMIBGroups 4 }
-- Compliances.
@@ -1084,4 +1080,3 @@
::= { dnsServMIBCompliances 1 }
END

View File

View File

@@ -804,11 +804,11 @@ ZYXEL-IESCOMMON-MIB DEFINITIONS ::= BEGIN
the maintenance operation should be performed. The target can
be a chassis, a plug-in module, and a port.
The value of the object will be:
(Chassis_id * 10000 + slot_id * 100 + port_id)
(Chassisid * 10000 + slotid * 100 + portid)
where
chassis_id: 0~3,
slot_id: 1~16,
port_id: 1~24"
chassisid: 0~3,
slotid: 1~16,
portid: 1~24"
::= { iesSysMaintenance 2 }
@@ -1697,9 +1697,9 @@ ZYXEL-IESCOMMON-MIB DEFINITIONS ::= BEGIN
iesMacFilterStatusEnable OBJECT-TYPE
SYNTAX INTEGER {
enable_accept(1),
enableaccept(1),
disable(2),
enable_deny(3)
enabledeny(3)
}
MAX-ACCESS read-write
STATUS current
@@ -2079,7 +2079,7 @@ ZYXEL-IESCOMMON-MIB DEFINITIONS ::= BEGIN
iesSwitchMode OBJECT-TYPE
SYNTAX INTEGER {
daisy_chain(1),
daisychain(1),
standalone(2)
}
MAX-ACCESS read-write

View File

@@ -2270,7 +2270,7 @@ ZYXEL-SAM1216 DEFINITIONS ::= BEGIN
-- STATUS current
-- DESCRIPTION
-- "configured transition L0 to L2 rate.
-- (<=min_l2rate/2 and >= 16 Kbps, For CTLM solution, 0 for system assign; for BCM solution, default:16.)"
-- (<=minl2rate/2 and >= 16 Kbps, For CTLM solution, 0 for system assign; for BCM solution, default:16.)"
-- ::= { adslLineConfEntry 22 }
-- ADSL Port Batch Set
@@ -2551,7 +2551,7 @@ ZYXEL-SAM1216 DEFINITIONS ::= BEGIN
-- STATUS current
-- DESCRIPTION
-- "configured transition L0 to L2 rate.
-- (<=min_l2rate/2 and >= 16 Kbps, For CTLM solution, 0 for system assign; for BCM solution, default:16.)"
-- (<=minl2rate/2 and >= 16 Kbps, For CTLM solution, 0 for system assign; for BCM solution, default:16.)"
-- ::= { adslPortBatchSet 22 }
-- Line Status
@@ -2800,9 +2800,9 @@ ZYXEL-SAM1216 DEFINITIONS ::= BEGIN
shdslLineConfPboMode OBJECT-TYPE
SYNTAX INTEGER {
normal_epl(1),
forced_epl(2),
forced_no_epl(3)
normalepl(1),
forcedepl(2),
forcednoepl(3)
}
MAX-ACCESS read-write
STATUS current
@@ -2865,9 +2865,9 @@ ZYXEL-SAM1216 DEFINITIONS ::= BEGIN
BIT 5: set alarm profile
BIT 6: set pmms mode to be normal
BIT 7: set pmms mode to be forced
BIT 8: set pbo mode to be normal_epl
BIT 9: set pbo mode to be forced_epl
BIT 10: set pbo mode to be forced_no_epl
BIT 8: set pbo mode to be normalepl
BIT 9: set pbo mode to be forcedepl
BIT 10: set pbo mode to be forcednoepl
BIT 11: set pbo value"
::= { shdslPortBatchSet 2 }

View File

@@ -751,10 +751,6 @@ jnxWxGrpStatsSysExchangeFailTcpAcclFailedPkts OBJECT-TYPE
"
::= { jnxWxGrpStatsSysExchange 6 }
---------------------------------
-- Acceleration Statistics Group
---------------------------------
jnxWxGrpStatsAccl OBJECT-IDENTITY
STATUS current
DESCRIPTION
@@ -872,9 +868,6 @@ jnxWxGrpStatsComp OBJECT-IDENTITY
"
::= { jnxWxGrpStats 3 }
-------------------------------------------------------------
-- Compression Statistics for each Application and Remote Wx
-------------------------------------------------------------
jnxWxGrpStatsCompTable OBJECT-TYPE
SYNTAX SEQUENCE OF JnxWxGrpStatsCompEntry
@@ -945,9 +938,6 @@ jnxWxGrpStatsCompCacheMisses OBJECT-TYPE
"
::= { jnxWxGrpStatsCompEntry 4 }
-----------------------------------------------------------------
-- WAN Performance Statistics for each Application and Remote Wx
-----------------------------------------------------------------
jnxWxGrpStatsWanPerf OBJECT-IDENTITY
STATUS current