From e43682ebb1fdfca7a287591b3f9adab0299b803c Mon Sep 17 00:00:00 2001
From: Peter van Dijk <peter.van.dijk@powerdns.com>
Date: Mon, 12 Jul 2021 14:18:15 +0200
Subject: [PATCH] SNMP: allocate local-use ranges for traps and trapObjects

---
 pdns/AUTH-MIB.txt                  | 77 ++++++++++++++++++++++++++++++
 pdns/dnsdistdist/DNSDIST-MIB.txt   |  4 ++
 pdns/recursordist/RECURSOR-MIB.txt |  4 ++
 3 files changed, 85 insertions(+)
 create mode 100644 pdns/AUTH-MIB.txt

diff --git a/pdns/AUTH-MIB.txt b/pdns/AUTH-MIB.txt
new file mode 100644
index 000000000000..94d1a12057e5
--- /dev/null
+++ b/pdns/AUTH-MIB.txt
@@ -0,0 +1,77 @@
+-- -*- snmpv2 -*-
+-- ----------------------------------------------------------------------
+-- MIB file for PowerDNS Authoritative
+-- ----------------------------------------------------------------------
+
+PDNSAUTH-MIB DEFINITIONS ::= BEGIN
+
+IMPORTS
+    OBJECT-TYPE, MODULE-IDENTITY, enterprises,
+    Counter64, NOTIFICATION-TYPE
+        FROM SNMPv2-SMI
+    CounterBasedGauge64
+        FROM HCNUM-TC
+    OBJECT-GROUP, MODULE-COMPLIANCE, NOTIFICATION-GROUP
+        FROM SNMPv2-CONF;
+
+auth MODULE-IDENTITY
+    LAST-UPDATED "202106120000Z"
+    ORGANIZATION "PowerDNS BV"
+    CONTACT-INFO "support@powerdns.com"
+    DESCRIPTION
+       "This MIB module describes information gathered through PowerDNS Authoritative."
+
+    REVISION "202106120000Z"
+    DESCRIPTION "Initial revision. Only a placeholder to allow allocating traps.5000-5999 and trapObjects.5000-5999 for local usage."
+
+    ::= { powerdns 1 }
+
+powerdns		OBJECT IDENTIFIER ::= { enterprises 43315 }
+
+stats OBJECT IDENTIFIER ::= { auth 1 }
+
+---
+--- Traps / Notifications
+---
+
+trap OBJECT IDENTIFIER ::= { auth 10 }
+traps OBJECT IDENTIFIER ::= { trap 0 } --- reverse-mappable
+trapObjects OBJECT IDENTIFIER ::= { auth 11 }
+
+--- { trapObjects 5000 } up to and including { trapObjects 5999 } are reserved for local, product-specific extensions to the Authoritative MIB
+
+--- { traps 5000 } up to and including { traps 5999 } are reserved for local, product-specific extensions to the Authoritative MIB
+
+---
+--- Conformance
+---
+
+authConformance OBJECT IDENTIFIER ::= { auth 100 }
+
+authCompliances MODULE-COMPLIANCE
+    STATUS current
+    DESCRIPTION "PowerDNS authoritative compliance statement"
+    MODULE
+    MANDATORY-GROUPS {
+        authGroup,
+        authTrapsGroup
+    }
+    ::= { authConformance 1 }
+
+authGroup OBJECT-GROUP
+    OBJECTS {
+
+    }
+    STATUS current
+    DESCRIPTION "Objects conformance group for PowerDNS Authoritative"
+    ::= { authConformance 2 }
+
+authTrapsGroup NOTIFICATION-GROUP
+    NOTIFICATIONS {
+        customTrap
+    }
+    STATUS current
+    DESCRIPTION "Traps conformance group for PowerDNS Authoritative"
+    ::= { authConformance 3 }
+
+END
diff --git a/pdns/dnsdistdist/DNSDIST-MIB.txt b/pdns/dnsdistdist/DNSDIST-MIB.txt
index 297d7304ffa3..d6f5a92568fc 100644
--- a/pdns/dnsdistdist/DNSDIST-MIB.txt
+++ b/pdns/dnsdistdist/DNSDIST-MIB.txt
@@ -605,6 +605,8 @@ trapReason OBJECT-TYPE
         "Reason for this trap"
     ::= { trapObjects 11 }
 
+--- { trapObjects 5000 } up to and including { trapObjects 5999 } are reserved for local, product-specific extensions to the dnsdist MIB
+
 backendStatusChangeTrap NOTIFICATION-TYPE
     OBJECTS {
         backendName,
@@ -641,6 +643,8 @@ customTrap NOTIFICATION-TYPE
     DESCRIPTION "Trap sent by sendCustomTrap"
     ::= { traps 3 }
 
+--- { traps 5000 } up to and including { traps 5999 } are reserved for local, product-specific extensions to the dnsdist MIB
+
 ---
 --- Conformance
 ---
diff --git a/pdns/recursordist/RECURSOR-MIB.txt b/pdns/recursordist/RECURSOR-MIB.txt
index cc7ad62b84e8..738a7a04a6bc 100644
--- a/pdns/recursordist/RECURSOR-MIB.txt
+++ b/pdns/recursordist/RECURSOR-MIB.txt
@@ -962,6 +962,8 @@ trapReason OBJECT-TYPE
         "Reason for this trap"
     ::= { trapObjects 1 }
 
+--- { trapObjects 5000 } up to and including { trapObjects 5999 } are reserved for local, product-specific extensions to the Recursor MIB
+
 customTrap NOTIFICATION-TYPE
     OBJECTS {
         trapReason
@@ -970,6 +972,8 @@ customTrap NOTIFICATION-TYPE
     DESCRIPTION "Trap sent by sendCustomTrap"
     ::= { traps 1 }
 
+--- { traps 5000 } up to and including { traps 5999 } are reserved for local, product-specific extensions to the Recursor MIB
+
 ---
 --- Conformance
 ---