Initial commitHEADmain

9 files changed, 1247 insertions, 0 deletions

diff --git a/MIBS/firebrick/FIREBRICK-BGP-MIB b/MIBS/firebrick/FIREBRICK-BGP-MIB
new file mode 100644
index 0000000..51fe759
--- /dev/null
+++ b/MIBS/firebrick/FIREBRICK-BGP-MIB
@@ -0,0 +1,181 @@
+-- *------------------------------------------------
+-- * Firebrick 2900 BGP MIB
+-- *
+-- * April 2020, C Malton
+-- *
+-- * Copyright (c) 2020 by Andrews & Arnold
+-- * 
+-- * See the Firebrick Manuals for more information
+-- *------------------------------------------------
+
+FIREBRICK-BGP-MIB DEFINITIONS ::= BEGIN
+
+IMPORTS
+    MODULE-IDENTITY,
+    OBJECT-TYPE,
+    enterprises,
+    Integer32
+        FROM SNMPv2-SMI
+    DisplayString
+        FROM SNMPv2-TC
+    InetAddressType,
+    InetAddress
+        FROM INET-ADDRESS-MIB
+    firebrickNewStyle
+        FROM FIREBRICK-MIB
+        ;
+
+fbBgpMib MODULE-IDENTITY
+    LAST-UPDATED "202004060000Z"
+    ORGANIZATION "Andrews & Arnold Limited"
+    CONTACT-INFO
+        "Andrews & Arnold
+        Unit 1&2, Enterprise Court
+        Bracknell, Berkshire, RG12 1QS
+        United Kingdom
+
+        Tel: +44 3333 400 999
+        Email: support@aa.net.uk"
+    DESCRIPTION
+        "This is a MIB Module for monitoring the Firebrick-specific structures
+        for general system features."
+    REVISION "202004060000Z"
+    DESCRIPTION "Initial version of this MIB module"
+    ::= { firebrickNewStyle 179 }
+
+fbBgpPeerTable OBJECT-TYPE
+    SYNTAX SEQUENCE OF FbBgpPeerEntry
+    MAX-ACCESS not-accessible
+    STATUS current
+    DESCRIPTION
+        "The list of BGP peers for this Firebrick"
+    ::= { fbBgpMib 1 }
+
+fbBgpPeerEntry OBJECT-TYPE
+    SYNTAX FbBgpPeerEntry
+    MAX-ACCESS not-accessible
+    STATUS current
+    DESCRIPTION
+        "An entry in the BGP Peer Names Table"
+    INDEX { fbBgpPeerAddressType, fbBgpPeerAddress }
+    ::= { fbBgpPeerTable 1 }
+
+FbBgpPeerEntry ::= SEQUENCE {
+    fbBgpPeerAddressType            InetAddressType,
+    fbBgpPeerAddress                InetAddress,
+    fbBgpPeerName                   DisplayString,
+    fbBgpPeerState                  Integer32,
+    fbBgpPeerRemoteAS               Integer32,
+    fbBgpPeerReceivedIpv4Prefixes   Integer32,
+    fbBgpPeerSecondsSinceLastChange Integer32,
+    fbBgpPeerReceivedIpv6Prefixes   Integer32
+}
+
+fbBgpPeerAddressType OBJECT-TYPE
+    SYNTAX InetAddressType
+    MAX-ACCESS read-only
+    STATUS current
+    DESCRIPTION
+        "The address type of fbBgpPeerAddressAddr."
+    ::= { fbBgpPeerEntry 1 }
+
+fbBgpPeerAddress OBJECT-TYPE
+    SYNTAX InetAddress
+    MAX-ACCESS read-only
+    STATUS current
+    DESCRIPTION
+        "The internet address for the peer.  The type of the address is 
+         determined by the value of the fbBgpPeerAddressType object."
+    ::= { fbBgpPeerEntry 2 }
+
+fbBgpPeerName OBJECT-TYPE
+    SYNTAX  DisplayString
+    MAX-ACCESS  read-only
+    STATUS  current
+    DESCRIPTION
+        "The name of the BGP Peer"
+    ::= { fbBgpPeerEntry 3 }
+
+fbBgpPeerState OBJECT-TYPE
+    SYNTAX  Integer32
+    MAX-ACCESS  read-only
+    STATUS  current
+    DESCRIPTION
+        "The current state of the BGP Peer"
+    ::= { fbBgpPeerEntry 4 }
+
+fbBgpPeerRemoteAS OBJECT-TYPE
+    SYNTAX  Integer32
+    MAX-ACCESS  read-only
+    STATUS  current
+    DESCRIPTION
+        "The remote AS of the BGP Peer"
+    ::= { fbBgpPeerEntry 5 }
+
+fbBgpPeerReceivedIpv4Prefixes OBJECT-TYPE
+    SYNTAX  Integer32
+    MAX-ACCESS  read-only
+    STATUS  current
+    DESCRIPTION
+        "The number of IPv4 prefixes received from the BGP Peer"
+    ::= { fbBgpPeerEntry 6 }
+
+fbBgpPeerSecondsSinceLastChange OBJECT-TYPE
+    SYNTAX  Integer32
+    MAX-ACCESS  read-only
+    STATUS  current
+    DESCRIPTION
+        "The number of seconds since the last state change for the BGP Peer"
+    ::= { fbBgpPeerEntry 7 }
+
+fbBgpPeerReceivedIpv6Prefixes OBJECT-TYPE
+    SYNTAX  Integer32
+    MAX-ACCESS  read-only
+    STATUS  current
+    DESCRIPTION
+        "The number of IPv6 prefixes received from the BGP Peer"
+    ::= { fbBgpPeerEntry 8 }
+
+fbBgpPeerExported OBJECT-TYPE
+    SYNTAX  Integer32
+    MAX-ACCESS  read-only
+    STATUS  current
+    DESCRIPTION
+        "The number of prefixes exported to the BGP Peer"
+    ::= { fbBgpPeerEntry 9 }
+
+fbBgpPeerLocalAddressType OBJECT-TYPE
+    SYNTAX InetAddressType
+    MAX-ACCESS read-only
+    STATUS current
+    DESCRIPTION
+        "The address type of fbBgpPeerLocalAddress."
+    ::= { fbBgpPeerEntry 10 }
+
+fbBgpPeerLocalAddress OBJECT-TYPE
+    SYNTAX InetAddress
+    MAX-ACCESS read-only
+    STATUS current
+    DESCRIPTION
+        "The local internet address used for this peer.  The type of the
+         address is determined by the value of the fbBgpPeerAddressType
+         object."
+    ::= { fbBgpPeerEntry 11 }
+
+fbBgpPeerLocalAS OBJECT-TYPE
+    SYNTAX  Integer32
+    MAX-ACCESS  read-only
+    STATUS  current
+    DESCRIPTION
+        "The local AS number for the BGP Peer"
+    ::= { fbBgpPeerEntry 12 }
+
+fbBgpPeerTableId OBJECT-TYPE
+    SYNTAX  Integer32
+    MAX-ACCESS  read-only
+    STATUS  current
+    DESCRIPTION
+        "The routing table number for this BGP Peer."
+    ::= { fbBgpPeerEntry 13 }
+
+END
diff --git a/MIBS/firebrick/FIREBRICK-CPU-MIB b/MIBS/firebrick/FIREBRICK-CPU-MIB
new file mode 100644
index 0000000..86c763e
--- /dev/null
+++ b/MIBS/firebrick/FIREBRICK-CPU-MIB
@@ -0,0 +1,130 @@
+-- *------------------------------------------------
+-- * Firebrick CPU MIB
+-- *
+-- * June 2020, Cliff Hones
+-- *
+-- * Copyright (c) 2020 by Andrews & Arnold
+-- * 
+-- * See the Firebrick Manuals for more information
+-- *------------------------------------------------
+
+FIREBRICK-CPU-MIB DEFINITIONS ::= BEGIN
+
+IMPORTS
+    MODULE-IDENTITY,
+    OBJECT-TYPE,
+    Integer32,
+    enterprises
+        FROM SNMPv2-SMI
+    DisplayString
+        FROM SNMPv2-TC
+    InetAddressType,
+    InetAddress
+        FROM INET-ADDRESS-MIB
+    OBJECT-GROUP
+        FROM SNMPv2-CONF
+    firebrickNewStyle
+	FROM FIREBRICK-MIB
+        ;
+
+fbCpuMib MODULE-IDENTITY
+    LAST-UPDATED "202006170000Z"
+    ORGANIZATION "Andrews & Arnold Limited"
+    CONTACT-INFO
+        "Andrews & Arnold
+        Unit 1&2, Enterprise Court
+        Bracknell, Berkshire, RG12 1QS
+        United Kingdom
+
+        Tel: +44 3333 400 999
+        Email: support@aa.net.uk"
+    DESCRIPTION
+        "This is a MIB Module for monitoring Firebrick CPU usage."
+    REVISION "202006170000Z"
+    DESCRIPTION "Initial version of this MIB module"
+    ::= { firebrickNewStyle 2 }
+
+fbCpuUsageTable OBJECT-TYPE
+    SYNTAX SEQUENCE OF FbCpuUsageEntry
+    MAX-ACCESS not-accessible
+    STATUS current
+    DESCRIPTION
+        "The table of CPU usage for this Firebrick"
+    ::= { fbCpuMib 1 }
+
+fbCpuUsageEntry OBJECT-TYPE
+    SYNTAX FbCpuUsageEntry
+    MAX-ACCESS not-accessible
+    STATUS current
+    DESCRIPTION
+        "An entry in the CPU usage table"
+    INDEX { fbCpuPeriod, fbCpuCore }
+    ::= { fbCpuUsageTable 1 }
+
+FbCpuUsageEntry ::= SEQUENCE {
+    fbCpuIRQ      Gauge32,
+    fbCpuAll      Gauge32,
+    fbCpuIRQPeak  Gauge32,
+    fbCpuAllPeak  Gauge32,
+    fbCpuPeriod   Integer32,
+    fbCpuCore     Integer32
+}
+
+fbCpuPeriod OBJECT-TYPE
+    SYNTAX Integer32
+    MAX-ACCESS not-accessible
+    STATUS current
+    DESCRIPTION
+        "The period in minutes covered by this table entry.
+         Zero indicates that an instantaneous value is required."
+    ::= { fbCpuUsageEntry 5 }
+
+fbCpuCore OBJECT-TYPE
+    SYNTAX Integer32
+    MAX-ACCESS not-accessible
+    STATUS current
+    DESCRIPTION
+        "The CPU core number covered by this table entry.
+	 The numbering starts at 1, so CPU0 (CORE) is 1 and CPU1 (NET) is 2."
+    ::= { fbCpuUsageEntry 6 }
+
+fbCpuIRQ OBJECT-TYPE
+    SYNTAX Gauge32
+    MAX-ACCESS read-only
+    STATUS current
+    DESCRIPTION
+        "The percentage of CPU time spent in interrupt processing for this period.
+	 If period is 0 the instantaneous usage in the last second is used.
+	 Units are 100ths of a percent, so 10000 indicates 100%."
+    ::= { fbCpuUsageEntry 1 }
+
+fbCpuAll OBJECT-TYPE
+    SYNTAX Gauge32
+    MAX-ACCESS read-only
+    STATUS current
+    DESCRIPTION
+        "The total percentage of CPU time spent non-idle for this period.
+	 If period is 0 the instantaneous usage in the last second is used.
+	 Units are 100ths of a percent, so 10000 indicates 100%."
+    ::= { fbCpuUsageEntry 2 }
+
+fbCpuIRQPeak OBJECT-TYPE
+    SYNTAX Gauge32
+    MAX-ACCESS read-only
+    STATUS current
+    DESCRIPTION
+        "The peak percentage of CPU time in interrupt processing during this period.
+	 If period is 0 the peak usage in the current minute is used.
+	 Units are 100ths of a percent, so 10000 indicates 100%."
+    ::= { fbCpuUsageEntry 3 }
+
+fbCpuAllPeak OBJECT-TYPE
+    SYNTAX Gauge32
+    MAX-ACCESS read-only
+    STATUS current
+    DESCRIPTION
+        "The peak percentage of CPU time non-idle during this period.
+	 If period is 0 the peak usage in the current minute is used.
+	 Units are 100ths of a percent, so 10000 indicates 100%."
+    ::= { fbCpuUsageEntry 4 }
+END
diff --git a/MIBS/firebrick/FIREBRICK-GLOBAL-MIB b/MIBS/firebrick/FIREBRICK-GLOBAL-MIB
new file mode 100644
index 0000000..452c803
--- /dev/null
+++ b/MIBS/firebrick/FIREBRICK-GLOBAL-MIB
@@ -0,0 +1,61 @@
+-- *------------------------------------------------
+-- * Firebrick System Global Info MIB
+-- *
+-- * Feb 2023, David Honour
+-- *
+-- * Copyright (c) 2023 by Andrews & Arnold
+-- *------------------------------------------------
+
+FIREBRICK-GLOBAL DEFINITIONS ::= BEGIN
+
+IMPORTS
+    MODULE-IDENTITY,
+    OBJECT-TYPE,
+    NOTIFICATION-TYPE,
+    Gauge32,
+    MODULE-COMPLIANCE,
+    OBJECT-GROUP,
+    NOTIFICATION-GROUP
+        FROM SNMPv2-CONF
+    TEXTUAL-CONVENTION,
+    enterprises
+        FROM RFC1155-SMI
+    DisplayString
+        FROM SNMPv2-TC
+    firebrickNewStyle
+        FROM FIREBRICK-MIB
+        ;
+
+fbGlobalMib MODULE-IDENTITY
+    LAST-UPDATED "202302170000Z"
+    ORGANIZATION "Andrews & Arnold Limited"
+    CONTACT-INFO
+        "Andrews & Arnold
+        Unit 1&2, Enterprise Court
+        Bracknell, Berkshire, RG12 1QS
+        United Kingdom
+
+        Tel: +44 3333 400 999
+        Email: support@aa.net.uk"
+    DESCRIPTION "System wide status"
+    REVISION "202302170000Z"
+    DESCRIPTION "Add memory usage"
+    ::= { firebrickNewStyle 4 }
+
+fbGlobalMemory OBJECT IDENTIFIER ::= { fbGlobalMib 1 }
+
+fbTotalMem OBJECT-TYPE
+    SYNTAX Gauge32
+    MAX-ACCESS read-only
+    STATUS current
+    DESCRIPTION "Total RAM (KiB)"
+    ::= { fbGlobalMemory 1 }
+
+fbFreeMem OBJECT-TYPE
+    SYNTAX Gauge32
+    MAX-ACCESS read-only
+    STATUS current
+    DESCRIPTION "Free RAM (KiB)"
+    ::= { fbGlobalMemory 2 }
+
+END
diff --git a/MIBS/firebrick/FIREBRICK-IPSEC-MIB b/MIBS/firebrick/FIREBRICK-IPSEC-MIB
new file mode 100644
index 0000000..15b3734
--- /dev/null
+++ b/MIBS/firebrick/FIREBRICK-IPSEC-MIB
@@ -0,0 +1,146 @@
+-- *------------------------------------------------
+-- * Firebrick IPsec MIB
+-- *
+-- * June 2020, Cliff Hones
+-- *
+-- * Copyright (c) 2020 by Andrews & Arnold
+-- * 
+-- * See the Firebrick Manuals for more information
+-- *------------------------------------------------
+
+FIREBRICK-IPSEC-MIB DEFINITIONS ::= BEGIN
+
+IMPORTS
+    MODULE-IDENTITY,
+    OBJECT-TYPE,
+    enterprises
+        FROM SNMPv2-SMI
+    DisplayString
+        FROM SNMPv2-TC
+    InetAddressType,
+    InetAddress
+        FROM INET-ADDRESS-MIB
+    firebrickNewStyle
+	FROM FIREBRICK-MIB
+        ;
+
+fbIPsecMib MODULE-IDENTITY
+    LAST-UPDATED "202006160000Z"
+    ORGANIZATION "Andrews & Arnold Limited"
+    CONTACT-INFO
+        "Andrews & Arnold
+        Unit 1&2, Enterprise Court
+        Bracknell, Berkshire, RG12 1QS
+        United Kingdom
+
+        Tel: +44 3333 400 999
+        Email: support@aa.net.uk"
+    DESCRIPTION
+        "This is a MIB Module for monitoring the Firebrick-specific structures
+        for IPSec."
+    REVISION "202006160000Z"
+    DESCRIPTION "Initial version of this MIB module"
+    ::= { firebrickNewStyle 500 }
+
+fbIPsecGeneral    OBJECT IDENTIFIER ::= { fbIPsecMib 1 }
+
+fbIPsecEstablished OBJECT-TYPE
+    SYNTAX     Integer32
+    MAX-ACCESS read-only
+    STATUS     current
+    DESCRIPTION
+            "The count of currently established IKE connections."
+    ::= { fbIPsecGeneral 1 }
+
+fbIPsecHalfOpen OBJECT-TYPE
+    SYNTAX     Integer32
+    MAX-ACCESS read-only
+    STATUS     current
+    DESCRIPTION
+            "The count of incoming IKE connections which have not yet authorized."
+    ::= { fbIPsecGeneral 2 }
+
+fbIPsecConnectionTable OBJECT-TYPE
+    SYNTAX SEQUENCE OF FbIPsecConnectionEntry
+    MAX-ACCESS not-accessible
+    STATUS current
+    DESCRIPTION
+        "The list of IPsec connections for this Firebrick"
+    ::= { fbIPsecMib 2 }
+
+fbIPsecConnectionEntry OBJECT-TYPE
+    SYNTAX FbIPsecConnectionEntry
+    MAX-ACCESS not-accessible
+    STATUS current
+    DESCRIPTION
+        "An entry in the IPsec connection table"
+    INDEX { fbIPsecConnectionIndex }
+    ::= { fbIPsecConnectionTable 1 }
+
+FbIPsecConnectionEntry ::= SEQUENCE {
+    fbIPsecConnectionIndex        Integer32,
+    fbIPsecConnectionName         DisplayString,
+    fbIPsecConnectionState        Integer32,
+    fbIPsecConnectionUptime       TimeTicks,
+    fbIPsecConnectionLocalId      DisplayString,
+    fbIPsecConnectionPeerId       DisplayString,
+    fbIPsecConnectionPeerAddress  DisplayString
+}
+
+fbIPsecConnectionIndex OBJECT-TYPE
+    SYNTAX  Integer32
+    MAX-ACCESS  not-accessible
+    STATUS  current
+    DESCRIPTION
+        "The index for the connection table"
+    ::= { fbIPsecConnectionEntry 1 }
+
+fbIPsecConnectionName OBJECT-TYPE
+    SYNTAX  DisplayString
+    MAX-ACCESS  read-only
+    STATUS  current
+    DESCRIPTION
+        "The config name for this connection"
+    ::= { fbIPsecConnectionEntry 2 }
+
+fbIPsecConnectionState OBJECT-TYPE
+    SYNTAX  Integer32
+    MAX-ACCESS  read-only
+    STATUS  current
+    DESCRIPTION
+        "The current state for this connection"
+    ::= { fbIPsecConnectionEntry 3 }
+
+fbIPsecConnectionUptime OBJECT-TYPE
+    SYNTAX  TimeTicks
+    MAX-ACCESS  read-only
+    STATUS  current
+    DESCRIPTION
+        "The uptime for this connection"
+    ::= { fbIPsecConnectionEntry 4 }
+
+fbIPsecConnectionLocalID OBJECT-TYPE
+    SYNTAX  DisplayString
+    MAX-ACCESS  read-only
+    STATUS  current
+    DESCRIPTION
+        "The local IKE ID for this connection"
+    ::= { fbIPsecConnectionEntry 5 }
+
+fbIPsecConnectionPeerID OBJECT-TYPE
+    SYNTAX  DisplayString
+    MAX-ACCESS  read-only
+    STATUS  current
+    DESCRIPTION
+        "The peer IKE ID for this connection"
+    ::= { fbIPsecConnectionEntry 6 }
+
+fbIPsecConnectionPeerAddress OBJECT-TYPE
+    SYNTAX  DisplayString
+    MAX-ACCESS  read-only
+    STATUS  current
+    DESCRIPTION
+        "The peer's IP address for this connection"
+    ::= { fbIPsecConnectionEntry 7 }
+
+END
diff --git a/MIBS/firebrick/FIREBRICK-L2TP-MIB b/MIBS/firebrick/FIREBRICK-L2TP-MIB
new file mode 100644
index 0000000..0742fe3
--- /dev/null
+++ b/MIBS/firebrick/FIREBRICK-L2TP-MIB
@@ -0,0 +1,308 @@
+-- *------------------------------------------------
+-- * Firebrick 2900 L2TP MIB
+-- *
+-- * April 2020, C Malton
+-- *
+-- * Copyright (c) 2020 by Andrews & Arnold
+-- * 
+-- * See the Firebrick Manuals for more information
+-- *------------------------------------------------
+
+FIREBRICK-L2TP-MIB DEFINITIONS ::= BEGIN
+
+IMPORTS
+    MODULE-IDENTITY,
+    OBJECT-TYPE,
+    Integer32,
+    enterprises
+        FROM SNMPv2-SMI
+    DisplayString
+        FROM SNMPv2-TC
+    InetAddressType,
+    InetAddress
+        FROM INET-ADDRESS-MIB
+    OBJECT-GROUP
+        FROM SNMPv2-CONF
+    firebrickNewStyle
+        FROM FIREBRICK-MIB
+        ;
+
+fbL2tpMib MODULE-IDENTITY
+    LAST-UPDATED "202004060000Z"
+    ORGANIZATION "Andrews & Arnold Limited"
+    CONTACT-INFO
+        "Andrews & Arnold
+        Unit 1&2, Enterprise Court
+        Bracknell, Berkshire, RG12 1QS
+        United Kingdom
+
+        Tel: +44 3333 400 999
+        Email: support@aa.net.uk"
+    DESCRIPTION
+        "This is a MIB Module for monitoring the Firebrick-specific structures
+        for L2tp."
+    REVISION "202004060000Z"
+    DESCRIPTION "Initial version of this MIB module"
+    ::= { firebrickNewStyle 1701 }
+
+
+fbL2tpGeneral    OBJECT IDENTIFIER ::= { fbL2tpMib 0 }
+fbL2tpGeneralTunnels    OBJECT IDENTIFIER ::= { fbL2tpGeneral 1 }
+fbL2tpGeneralSessions    OBJECT IDENTIFIER ::= { fbL2tpGeneral 2 }
+
+fbL2tpFreeTunnels OBJECT-TYPE
+    SYNTAX Integer32
+    MAX-ACCESS read-only
+    STATUS current
+    DESCRIPTION
+        "Number of tunnels in FREE state"
+    ::= { fbL2tpGeneralTunnels 0 }
+
+fbL2tpOpeningTunnels OBJECT-TYPE
+    SYNTAX Integer32
+    MAX-ACCESS read-only
+    STATUS current
+    DESCRIPTION
+        "Number of tunnels in OPENING state"
+    ::= { fbL2tpGeneralTunnels 1 }
+
+fbL2tpLiveIncomingTunnels OBJECT-TYPE
+    SYNTAX Integer32
+    MAX-ACCESS read-only
+    STATUS current
+    DESCRIPTION
+        "Number of tunnels in LIVE (Incoming) state"
+    ::= { fbL2tpGeneralTunnels 2 }
+
+fbL2tpLiveOutgoingTunnels OBJECT-TYPE
+    SYNTAX Integer32
+    MAX-ACCESS read-only
+    STATUS current
+    DESCRIPTION
+        "Number of tunnels in LIVE (Outgoing) state"
+    ::= { fbL2tpGeneralTunnels 3 }
+
+fbL2tpClosingTunnels OBJECT-TYPE
+    SYNTAX Integer32
+    MAX-ACCESS read-only
+    STATUS current
+    DESCRIPTION
+        "Number of tunnels in CLOSING state"
+    ::= { fbL2tpGeneralTunnels 4 }
+
+fbL2tpFailedTunnels OBJECT-TYPE
+    SYNTAX Integer32
+    MAX-ACCESS read-only
+    STATUS current
+    DESCRIPTION
+        "Number of tunnels in FAILED state"
+    ::= { fbL2tpGeneralTunnels 5 }
+
+fbL2tpClosedTunnels OBJECT-TYPE
+    SYNTAX Integer32
+    MAX-ACCESS read-only
+    STATUS current
+    DESCRIPTION
+        "Number of tunnels in CLOSED state"
+    ::= { fbL2tpGeneralTunnels 6 }
+
+fbL2tpFreeSessions OBJECT-TYPE
+    SYNTAX Integer32
+    MAX-ACCESS read-only
+    STATUS current
+    DESCRIPTION
+        "Number of sessions in FREE state"
+    ::= { fbL2tpGeneralSessions 0 }
+
+fbL2tpWaitingSessions OBJECT-TYPE
+    SYNTAX Integer32
+    MAX-ACCESS read-only
+    STATUS current
+    DESCRIPTION
+        "Number of sessions in WAITING state"
+    ::= { fbL2tpGeneralSessions 1 }
+
+fbL2tpOpeningSessions OBJECT-TYPE
+    SYNTAX Integer32
+    MAX-ACCESS read-only
+    STATUS current
+    DESCRIPTION
+        "Number of sessions in OPENING state"
+    ::= { fbL2tpGeneralSessions 2 }
+
+fbL2tpNegotiatingSessions OBJECT-TYPE
+    SYNTAX Integer32
+    MAX-ACCESS read-only
+    STATUS current
+    DESCRIPTION
+        "Number of sessions in NEGOTIATING state"
+    ::= { fbL2tpGeneralSessions 3 }
+
+fbL2tpAuthPendingSessions OBJECT-TYPE
+    SYNTAX Integer32
+    MAX-ACCESS read-only
+    STATUS current
+    DESCRIPTION
+        "Number of sessions in AUTH-PENDING state"
+    ::= { fbL2tpGeneralSessions 4 }
+
+fbL2tpStartedSessions OBJECT-TYPE
+    SYNTAX Integer32
+    MAX-ACCESS read-only
+    STATUS current
+    DESCRIPTION
+        "Number of sessions in STARTED state"
+    ::= { fbL2tpGeneralSessions 5 }
+
+fbL2tpLiveSessions OBJECT-TYPE
+    SYNTAX Integer32
+    MAX-ACCESS read-only
+    STATUS current
+    DESCRIPTION
+        "Number of sessions in LIVE state"
+    ::= { fbL2tpGeneralSessions 6 }
+
+fbL2tpAcctPendingSessions OBJECT-TYPE
+    SYNTAX Integer32
+    MAX-ACCESS read-only
+    STATUS current
+    DESCRIPTION
+        "Number of sessions in ACCT-PENDING state"
+    ::= { fbL2tpGeneralSessions 7 }
+
+fbL2tpClosingSessions OBJECT-TYPE
+    SYNTAX Integer32
+    MAX-ACCESS read-only
+    STATUS current
+    DESCRIPTION
+        "Number of sessions in CLOSING state"
+    ::= { fbL2tpGeneralSessions 8 }
+
+fbL2tpClosedSessions OBJECT-TYPE
+    SYNTAX Integer32
+    MAX-ACCESS read-only
+    STATUS current
+    DESCRIPTION
+        "Number of sessions in CLOSED state"
+    ::= { fbL2tpGeneralSessions 9 }
+
+fbL2tpSessionNegotiationSlotsFree OBJECT-TYPE
+    SYNTAX Integer32
+    MAX-ACCESS read-only
+    STATUS current
+    DESCRIPTION
+        "Number of session negotiation slots free"
+    ::= { fbL2tpGeneralSessions 10 }
+
+
+
+-- *  Peers Table
+
+fbL2tpPeerTable OBJECT-TYPE
+    SYNTAX SEQUENCE OF FbL2tpPeerEntry
+    MAX-ACCESS not-accessible
+    STATUS current
+    DESCRIPTION
+        "The list of L2TP peers for this Firebrick"
+    ::= { fbL2tpMib 1 }
+
+fbL2tpPeerEntry OBJECT-TYPE
+    SYNTAX FbL2tpPeerEntry
+    MAX-ACCESS not-accessible
+    STATUS current
+    DESCRIPTION
+        "An entry in the IPv4 BGP Peer Names Table"
+    INDEX { fbL2tpPeerAddressType, fbL2tpPeerAddress }
+    ::= { fbL2tpPeerTable 1 }
+
+FbL2tpPeerEntry ::= SEQUENCE {
+    fbL2tpPeerAddressType   InetAddressType,
+    fbL2tpPeerAddress       InetAddress,
+    fbL2tpPeerLoginName     DisplayString,
+    fbL2tpPeerHostName      DisplayString,
+    fbL2tpPeerInTunnels     Integer32,
+    fbL2tpPeerOutTunnels    Integer32,
+    fbL2tpPeerOldestUptime  Integer32,
+    fbL2tpPeerLiveTunnels   Integer32,
+    fbL2tpPeerSessions      Integer32
+}
+
+fbL2tpPeerAddressType OBJECT-TYPE
+    SYNTAX InetAddressType
+    MAX-ACCESS not-accessible
+    STATUS current
+    DESCRIPTION
+        "The internet address for the peer.  The type of the address is 
+         determined by the value of the fbL2tpAddressType object."
+    ::= { fbL2tpPeerEntry 1 }
+
+fbL2tpPeerAddress OBJECT-TYPE
+    SYNTAX InetAddress (SIZE (4..20))
+    MAX-ACCESS not-accessible
+    STATUS current
+    DESCRIPTION
+        "The internet address for the peer.  The type of the address is 
+         determined by the value of the fbL2tpAddressType object."
+    ::= { fbL2tpPeerEntry 2 }
+
+fbL2tpPeerLoginName OBJECT-TYPE
+    SYNTAX  DisplayString
+    MAX-ACCESS  not-accessible
+    STATUS  current
+    DESCRIPTION
+        "The login name of the L2TP Peer"
+    ::= { fbL2tpPeerEntry 3 }
+
+fbL2tpPeerHostName OBJECT-TYPE
+    SYNTAX  DisplayString
+    MAX-ACCESS  not-accessible
+    STATUS  current
+    DESCRIPTION
+        "The host name of the L2TP Peer"
+    ::= { fbL2tpPeerEntry 4 }
+
+fbL2tpPeerInTunnels OBJECT-TYPE
+    SYNTAX  Integer32
+    MAX-ACCESS  not-accessible
+    STATUS  current
+    DESCRIPTION
+        "The number of inbound tunnels from the L2TP peer"
+    ::= { fbL2tpPeerEntry 5 }
+
+fbL2tpPeerOutTunnels OBJECT-TYPE
+    SYNTAX  Integer32
+    MAX-ACCESS  not-accessible
+    STATUS  current
+    DESCRIPTION
+        "The number of outbound tunnels from the L2TP peer"
+    ::= { fbL2tpPeerEntry 6 }
+
+fbL2tpPeerOldestUptime OBJECT-TYPE
+    SYNTAX  Integer32
+    MAX-ACCESS  not-accessible
+    STATUS  current
+    DESCRIPTION
+        "The uptime of the oldest tunnel from the L2TP peer"
+    ::= { fbL2tpPeerEntry 7 }
+
+
+fbL2tpPeerLiveTunnels OBJECT-TYPE
+    SYNTAX  Integer32
+    MAX-ACCESS  not-accessible
+    STATUS  current
+    DESCRIPTION
+        "The number of live tunnels from the L2TP peer"
+    ::= { fbL2tpPeerEntry 8 }
+
+
+fbL2tpPeerSessions OBJECT-TYPE
+    SYNTAX  Integer32
+    MAX-ACCESS  not-accessible
+    STATUS  current
+    DESCRIPTION
+        "The number of sessions from the L2TP peer"
+    ::= { fbL2tpPeerEntry 9 }
+
+
+
+END
diff --git a/MIBS/firebrick/FIREBRICK-MIB b/MIBS/firebrick/FIREBRICK-MIB
new file mode 100644
index 0000000..ab40534
--- /dev/null
+++ b/MIBS/firebrick/FIREBRICK-MIB
@@ -0,0 +1,40 @@
+-- *------------------------------------------------
+-- * Firebrick 2900 BGP MIB
+-- *
+-- * April 2020, C Malton
+-- *
+-- * Copyright (c) 2020 by Andrews & Arnold
+-- * 
+-- * See the Firebrick Manuals for more information
+-- *------------------------------------------------
+
+FIREBRICK-MIB DEFINITIONS ::= BEGIN
+
+IMPORTS
+    MODULE-IDENTITY,
+    OBJECT-TYPE,
+    enterprises
+        FROM SNMPv2-SMI
+        ;
+
+firebrick MODULE-IDENTITY
+    LAST-UPDATED "202004060000Z"
+    ORGANIZATION "Andrews & Arnold Limited"
+    CONTACT-INFO
+        "Andrews & Arnold
+        Unit 1&2, Enterprise Court
+        Bracknell, Berkshire, RG12 1QS
+        United Kingdom
+
+        Tel: +44 3333 400 999
+        Email: support@aa.net.uk"
+    DESCRIPTION
+        "This is a MIB Module for monitoring the Firebrick-specific structures
+        for general system features."
+    REVISION "202004060000Z"
+    DESCRIPTION "Initial version of this MIB module"
+    ::= { enterprises 24693 }
+
+firebrickNewStyle  OBJECT IDENTIFIER ::= { firebrick 100 }
+
+END
\ No newline at end of file
diff --git a/MIBS/firebrick/FIREBRICK-MONITORING b/MIBS/firebrick/FIREBRICK-MONITORING
new file mode 100644
index 0000000..598076a
--- /dev/null
+++ b/MIBS/firebrick/FIREBRICK-MONITORING
@@ -0,0 +1,113 @@
+-- *------------------------------------------------
+-- * Firebrick Monitoring MIB
+-- *
+-- * June 2020, Cliff Hones
+-- *
+-- * Copyright (c) 2020 by Andrews & Arnold
+-- * 
+-- * See the Firebrick Manuals for more information
+-- *------------------------------------------------
+
+FIREBRICK-MONITORING DEFINITIONS ::= BEGIN
+
+IMPORTS
+    MODULE-IDENTITY,
+    OBJECT-TYPE,
+    NOTIFICATION-TYPE,
+    Counter32,
+    Counter64,
+    Gauge32,
+    Integer32,
+    Integer32
+        FROM SNMPv2-SMI
+    MODULE-COMPLIANCE,
+    OBJECT-GROUP,
+    NOTIFICATION-GROUP
+        FROM SNMPv2-CONF
+    TEXTUAL-CONVENTION,
+    DisplayString,
+    TimeStamp,
+    TimeInterval,
+    TruthValue
+        FROM SNMPv2-TC
+    enterprises
+        FROM RFC1155-SMI
+    firebrickNewStyle
+	FROM FIREBRICK-MIB
+	;
+
+fbMonitoringMib MODULE-IDENTITY
+    LAST-UPDATED "202006170000Z"
+    ORGANIZATION "Andrews & Arnold Limited"
+    CONTACT-INFO
+        "Andrews & Arnold
+        Unit 1&2, Enterprise Court
+        Bracknell, Berkshire, RG12 1QS
+        United Kingdom
+
+        Tel: +44 3333 400 999
+        Email: support@aa.net.uk"
+    DESCRIPTION
+        "This is a MIB Module for monitoring the Firebrick-specific structures
+        for general system features."
+    REVISION "202006170000Z"
+    DESCRIPTION "Initial version of this MIB module"
+    ::= { firebrickNewStyle 1 }
+
+fbMonReadingTable OBJECT-TYPE
+    SYNTAX SEQUENCE OF FbMonReadingEntry
+    MAX-ACCESS not-accessible
+    STATUS current
+    DESCRIPTION
+        "The list of readings for this Firebrick"
+    ::= { fbMonitoringMib 1 }
+
+fbMonReadingEntry OBJECT-TYPE
+    SYNTAX FbMonReadingEntry
+    MAX-ACCESS not-accessible
+    STATUS current
+    DESCRIPTION
+        "An entry in the FB readings table"
+    INDEX { fbMonReadingIndex }
+    ::= { fbMonReadingTable 1 }
+
+FbMonReadingEntry ::= SEQUENCE {
+    fbMonReadingIndex        Integer32,
+    fbMonReadingType         DisplayString,
+    fbMonReadingName         DisplayString,
+    fbMonReadingValue        Integer32
+}
+
+fbMonReadingIndex OBJECT-TYPE
+    SYNTAX Integer32
+    MAX-ACCESS not-accessible
+    STATUS current
+    DESCRIPTION
+        "The index for the readings table"
+    ::= { fbMonReadingEntry 1 }
+
+fbMonReadingType OBJECT-TYPE
+    SYNTAX DisplayString
+    MAX-ACCESS read-only
+    STATUS current
+    DESCRIPTION
+        "The type of this reading"
+    ::= { fbMonReadingEntry 2 }
+
+fbMonReadingName OBJECT-TYPE
+    SYNTAX DisplayString
+    MAX-ACCESS read-only
+    STATUS current
+    DESCRIPTION
+        "The name of this reading"
+    ::= { fbMonReadingEntry 3 }
+
+fbMonReadingValue OBJECT-TYPE
+    SYNTAX Integer32
+    MAX-ACCESS read-only
+    STATUS current
+    DESCRIPTION
+        "The value of this reading"
+    ::= { fbMonReadingEntry 4 }
+
+END
diff --git a/MIBS/firebrick/FIREBRICK-RUNSTATS-MIB b/MIBS/firebrick/FIREBRICK-RUNSTATS-MIB
new file mode 100644
index 0000000..111d690
--- /dev/null
+++ b/MIBS/firebrick/FIREBRICK-RUNSTATS-MIB
@@ -0,0 +1,86 @@
+-- *------------------------------------------------
+-- * Firebrick Running Statistics MIB
+-- *
+-- * June 2020, Cliff Hones
+-- *
+-- * Copyright (c) 2020 by Andrews & Arnold
+-- * 
+-- * See the Firebrick Manuals for more information
+-- *------------------------------------------------
+
+FIREBRICK-RUNSTATS-MIB DEFINITIONS ::= BEGIN
+
+IMPORTS
+    MODULE-IDENTITY,
+    OBJECT-TYPE,
+    Integer32,
+    enterprises
+        FROM SNMPv2-SMI
+    DisplayString
+        FROM SNMPv2-TC
+    InetAddressType,
+    InetAddress
+        FROM INET-ADDRESS-MIB
+    OBJECT-GROUP
+        FROM SNMPv2-CONF
+    firebrickNewStyle
+	FROM FIREBRICK-MIB
+        ;
+
+fbRunMib MODULE-IDENTITY
+    LAST-UPDATED "202006170000Z"
+    ORGANIZATION "Andrews & Arnold Limited"
+    CONTACT-INFO
+        "Andrews & Arnold
+        Unit 1&2, Enterprise Court
+        Bracknell, Berkshire, RG12 1QS
+        United Kingdom
+
+        Tel: +44 3333 400 999
+        Email: support@aa.net.uk"
+    DESCRIPTION
+        "This is a MIB Module for monitoring Firebrick CPU usage."
+    REVISION "202006170000Z"
+    DESCRIPTION "Initial version of this MIB module"
+    ::= { firebrickNewStyle 3 }
+
+fbRunStatsTable OBJECT-TYPE
+    SYNTAX SEQUENCE OF FbRunStatsEntry
+    MAX-ACCESS not-accessible
+    STATUS current
+    DESCRIPTION
+        "The table of runtime stats for this Firebrick"
+    ::= { fbRunMib 1 }
+
+fbRunStatsEntry OBJECT-TYPE
+    SYNTAX FbRunStatsEntry
+    MAX-ACCESS not-accessible
+    STATUS current
+    DESCRIPTION
+        "An entry in the CPU usage table"
+    INDEX { fbRunCore }
+    ::= { fbRunStatsTable 1 }
+
+FbRunStatsEntry ::= SEQUENCE {
+    fbRunBuffers  Gauge32,
+    fbRunCore     Integer32
+}
+
+fbRunCore OBJECT-TYPE
+    SYNTAX Integer32
+    MAX-ACCESS not-accessible
+    STATUS current
+    DESCRIPTION
+        "The CPU core number covered by this table entry.
+	 The numbering starts at 1, so CPU0 (CORE) is 1 and CPU1 (NET) is 2."
+    ::= { fbRunStatsEntry 2 }
+
+fbRunBuffers OBJECT-TYPE
+    SYNTAX Gauge32
+    MAX-ACCESS read-only
+    STATUS current
+    DESCRIPTION
+        "The count of buffers which are currently free on this CPU core."
+    ::= { fbRunStatsEntry 1 }
+
+END
diff --git a/MIBS/firebrick/FIREBRICK-VOIP-MIB b/MIBS/firebrick/FIREBRICK-VOIP-MIB
new file mode 100644
index 0000000..a842a06
--- /dev/null
+++ b/MIBS/firebrick/FIREBRICK-VOIP-MIB
@@ -0,0 +1,182 @@
+-- *------------------------------------------------
+-- * Firebrick 2900 VOIP MIB
+-- *
+-- * June 2020, Cliff Hones
+-- *
+-- * Copyright (c) 2020 by Andrews & Arnold
+-- * 
+-- * See the Firebrick Manuals for more information
+-- *------------------------------------------------
+
+FIREBRICK-VOIP-MIB DEFINITIONS ::= BEGIN
+
+IMPORTS
+    MODULE-IDENTITY,
+    OBJECT-TYPE,
+    Integer32,
+    enterprises
+        FROM SNMPv2-SMI
+    DisplayString
+        FROM SNMPv2-TC
+    InetAddressType,
+    InetAddress
+        FROM INET-ADDRESS-MIB
+    OBJECT-GROUP
+        FROM SNMPv2-CONF
+    firebrickNewStyle
+	FROM FIREBRICK-MIB
+        ;
+
+fbSipMib MODULE-IDENTITY
+    LAST-UPDATED "202006180000Z"
+    ORGANIZATION "Andrews & Arnold Limited"
+    CONTACT-INFO
+        "Andrews & Arnold
+        Unit 1&2, Enterprise Court
+        Bracknell, Berkshire, RG12 1QS
+        United Kingdom
+
+        Tel: +44 3333 400 999
+        Email: support@aa.net.uk"
+    DESCRIPTION
+        "This is a MIB Module for monitoring the Firebrick-specific structures
+        for VoIP/SIP."
+    REVISION "202006180000Z"
+    DESCRIPTION "Initial version of this MIB module"
+    ::= { firebrickNewStyle 5060 }
+
+-- *  Global items
+
+fbSipActiveLegs OBJECT-TYPE
+    SYNTAX Integer32
+    MAX-ACCESS read-only
+    STATUS current
+    DESCRIPTION
+        "The total number of active call legs on this Firebrick"
+    ::= { fbSipMib 1 }
+
+fbSipRadiusRegs OBJECT-TYPE
+    SYNTAX Integer32
+    MAX-ACCESS read-only
+    STATUS current
+    DESCRIPTION
+        "The number of RADIUS-based incoming registrations on this Firebrick"
+    ::= { fbSipMib 2 }
+
+-- *  Carriers Table
+
+fbSipCarrierTable OBJECT-TYPE
+    SYNTAX SEQUENCE OF FbSipCarrierEntry
+    MAX-ACCESS not-accessible
+    STATUS current
+    DESCRIPTION
+        "The list of VoIP carriers for this Firebrick"
+    ::= { fbSipMib 3 }
+
+fbSipCarrierEntry OBJECT-TYPE
+    SYNTAX FbSipCarrierEntry
+    MAX-ACCESS not-accessible
+    STATUS current
+    DESCRIPTION
+        "An entry in the Carriers table"
+    INDEX { fbSipCarrierIndex }
+    ::= { fbSipCarrierTable 1 }
+
+FbSipCarrierEntry ::= SEQUENCE {
+    fbSipCarrierIndex           Integer32,
+    fbSipCarrierName            DisplayString,
+    fbSipCarrierTotalLegs       Integer32,
+    fbSipCarrierConnectedLegs   Integer32
+}
+
+fbSipCarrierName OBJECT-TYPE
+    SYNTAX  DisplayString
+    MAX-ACCESS  read-only
+    STATUS  current
+    DESCRIPTION
+        "The config name of this carrier"
+    ::= { fbSipCarrierEntry 1 }
+
+fbSipCarrierIndex OBJECT-TYPE
+    SYNTAX Integer32 (0..255)
+    MAX-ACCESS not-accessible
+    STATUS current
+    DESCRIPTION
+        "The index of the SIP carrier in the carriers table"
+    ::= { fbSipCarrierEntry 4 }
+
+fbSipCarrierTotalLegs OBJECT-TYPE
+    SYNTAX Integer32
+    MAX-ACCESS read-only
+    STATUS current
+    DESCRIPTION
+        "The total number of call legs for this carrier"
+    ::= { fbSipCarrierEntry 2 }
+
+fbSipCarrierConnectedLegs OBJECT-TYPE
+    SYNTAX Integer32
+    MAX-ACCESS read-only
+    STATUS current
+    DESCRIPTION
+        "The number of connected call legs for this carrier"
+    ::= { fbSipCarrierEntry 3 }
+
+-- *  Telephone Table
+
+fbSipPhoneTable OBJECT-TYPE
+    SYNTAX SEQUENCE OF FbSipPhoneEntry
+    MAX-ACCESS not-accessible
+    STATUS current
+    DESCRIPTION
+        "The list of telephones on this Firebrick"
+    ::= { fbSipMib 4 }
+
+fbSipPhoneEntry OBJECT-TYPE
+    SYNTAX FbSipPhoneEntry
+    MAX-ACCESS not-accessible
+    STATUS current
+    DESCRIPTION
+        "An entry in the telephone table"
+    INDEX { fbSipPhoneIndex }
+    ::= { fbSipPhoneTable 1 }
+
+FbSipPhoneEntry ::= SEQUENCE {
+    fbSipPhoneIndex           Integer32,
+    fbSipPhoneName            DisplayString,
+    fbSipPhoneTotalLegs       Integer32,
+    fbSipPhoneConnectedLegs   Integer32
+}
+
+fbSipPhoneName OBJECT-TYPE
+    SYNTAX  DisplayString
+    MAX-ACCESS  read-only
+    STATUS  current
+    DESCRIPTION
+        "The name of this telephone"
+    ::= { fbSipPhoneEntry 1 }
+
+fbSipCarrierIndex OBJECT-TYPE
+    SYNTAX Integer32 (0..255)
+    MAX-ACCESS not-accessible
+    STATUS current
+    DESCRIPTION
+        "The index of the phone in the telephone table"
+    ::= { fbSipPhoneEntry 4 }
+
+fbSipPhoneTotalLegs OBJECT-TYPE
+    SYNTAX Integer32
+    MAX-ACCESS read-only
+    STATUS current
+    DESCRIPTION
+        "The total number of call legs for this telephone"
+    ::= { fbSipCarrierEntry 2 }
+
+fbSipPhoneConnectedLegs OBJECT-TYPE
+    SYNTAX Integer32
+    MAX-ACCESS read-only
+    STATUS current
+    DESCRIPTION
+        "The number of connected call legs for this telephone"
+    ::= { fbSipPhoneEntry 3 }
+
+END