Resolve leo-project/leofs/issues/941

apps/leo_storage/snmp/snmpa_storage_0/LEO-STORAGE.mib

@@ -8,19 +8,19 @@ IMPORTS
         DisplayString, TruthValue FROM SNMPv2-TC;
 
         leofs    MODULE-IDENTITY
-                 LAST-UPDATED "201502140000Z"
+                 LAST-UPDATED "201803220000Z"
                  ORGANIZATION "github.com/leo-project"
                  CONTACT-INFO
                              "e-mail:[email protected]"
                  DESCRIPTION
                              "LEO STORAGE SNMP MIB"
-                 REVISION    "201502140000Z"
+                 REVISION    "v1.4.0"
                  DESCRIPTION
-                             "v1.2"
+                             "v1.4.0"
                  ::= { enterprises 35450}
 
 leofsGroups OBJECT IDENTIFIER ::= { leofs 1 }
-staticOid OBJECT IDENTIFIER   ::= { leofs 34}
+staticOid OBJECT IDENTIFIER   ::= { leofs 56}
 
 -- =====================================
 -- Items
@@ -175,7 +175,7 @@ storage-active-objects
         SYNTAX Gauge32
         MAX-ACCESS read-only
         STATUS current
-        DESCRIPTION "Acrive Objects during"
+        DESCRIPTION "Active Objects during"
         ::= { staticOid 18 }
 
 storage-total-objects
@@ -191,7 +191,7 @@ storage-active-objects-sizes
         SYNTAX Gauge32
         MAX-ACCESS read-only
         STATUS current
-        DESCRIPTION "Acrive Objects Sizes during"
+        DESCRIPTION "Active Objects Sizes during"
         ::= { staticOid 20 }
 
 storage-total-objects-sizes
@@ -205,28 +205,28 @@ storage-total-objects-sizes
 --
 -- MQ-related items
 --
-num-of-msg-replicate
+mq-num-of-msg-replicate
     OBJECT-TYPE
         SYNTAX Gauge32
         MAX-ACCESS read-only
         STATUS current
-        DESCRIPTION "Total of messages - replication"
+        DESCRIPTION "Total number of messages of replication"
         ::= { staticOid 22 }
 
-num-of-msg-sync-vnode
+mq-num-of-msg-sync-vnode
     OBJECT-TYPE
         SYNTAX Gauge32
         MAX-ACCESS read-only
         STATUS current
-        DESCRIPTION "Total of messages - sync vnode"
+        DESCRIPTION "Total number of messages of sync vnode"
         ::= { staticOid 23 }
 
-num-of-msg-rebalance
+mq-num-of-msg-rebalance
     OBJECT-TYPE
         SYNTAX Gauge32
         MAX-ACCESS read-only
         STATUS current
-        DESCRIPTION "Total of messages - rebalance"
+        DESCRIPTION "Total number of messages of rebalance"
         ::= { staticOid 24 }
 
 ---
@@ -262,8 +262,111 @@ vm-allocated-mem-5m
         MAX-ACCESS read-only
         STATUS current
         DESCRIPTION "Allocated memory (5min mean)"
-        ::= { staticOid 34 }
+            ::= { staticOid 34 }
 
+---
+--- Other MQ related items
+--- @since 2018-03-22 (v1.4.0)
+---
+mq-num-of-msg-recovery-node
+    OBJECT-TYPE
+        SYNTAX Gauge32
+        MAX-ACCESS read-only
+        STATUS current
+        DESCRIPTION "Total number of messages of recovery node"
+        ::= { staticOid 41 }
+
+mq-num-of-msg-deletion-dir
+    OBJECT-TYPE
+        SYNTAX Gauge32
+        MAX-ACCESS read-only
+        STATUS current
+        DESCRIPTION "Total number of messages of deletion directories"
+        ::= { staticOid 42 }
+
+mq-num-of-msg-async-deletion-dir
+    OBJECT-TYPE
+        SYNTAX Gauge32
+        MAX-ACCESS read-only
+        STATUS current
+        DESCRIPTION "Total number of messages of async deletion directories"
+        ::= { staticOid 43 }
+
+mq-num-of-msg-req-deletion-dir
+    OBJECT-TYPE
+        SYNTAX Gauge32
+        MAX-ACCESS read-only
+        STATUS current
+        DESCRIPTION "Total number of messages of request of deletion directories"
+        ::= { staticOid 44 }
+
+mq-mdcr-num-of-msg-req-comp-metadata
+    OBJECT-TYPE
+        SYNTAX Gauge32
+        MAX-ACCESS read-only
+        STATUS current
+        DESCRIPTION "Total number of messages of comparison metadata between data centers"
+        ::= { staticOid 45 }
+
+mq-mdcr-num-of-msg-req-sync-obj
+    OBJECT-TYPE
+        SYNTAX Gauge32
+        MAX-ACCESS read-only
+        STATUS current
+        DESCRIPTION "Total number of messages of sync objects between data centers"
+            ::= { staticOid 46 }
+
+---
+--- Data-compaction related items
+--- @since 2018-03-22 (v1.4.0)
+---
+comp-state
+    OBJECT-TYPE
+        SYNTAX Gauge32
+        MAX-ACCESS read-only
+        STATUS current
+        DESCRIPTION "Current state of data-compaction"
+            ::= { staticOid 51 }
+
+comp-last-start-datetime
+    OBJECT-TYPE
+        SYNTAX Gauge32
+        MAX-ACCESS read-only
+        STATUS current
+        DESCRIPTION "Last start date time"
+            ::= { staticOid 52 }
+
+comp-last-end-datetime
+    OBJECT-TYPE
+        SYNTAX Gauge32
+        MAX-ACCESS read-only
+        STATUS current
+        DESCRIPTION "Last end date time"
+            ::= { staticOid 53 }
+
+comp-num-of-pending-targets
+    OBJECT-TYPE
+        SYNTAX Gauge32
+        MAX-ACCESS read-only
+        STATUS current
+        DESCRIPTION "Total number of pending targets of data compaction"
+            ::= { staticOid 54 }
+
+comp-num-of-ongoing-targets
+    OBJECT-TYPE
+        SYNTAX Gauge32
+        MAX-ACCESS read-only
+        STATUS current
+        DESCRIPTION "Total number of ongoing targets of data compaction"
+            ::= { staticOid 55 }
+
+comp-num-of-out-of-targets
+    OBJECT-TYPE
+        SYNTAX Gauge32
+        MAX-ACCESS read-only
+        STATUS current
+        DESCRIPTION "Total number of out of targets of data compaction"
+            ::= { staticOid 56 }
 
 --
 -- Global Group
@@ -275,9 +378,14 @@ leofsGroup OBJECT-GROUP
                  req-writes-1m, req-reads-1m, req-deletes-1m,
                  req-writes-5m, req-reads-5m, req-deletes-5m,
                  storage-active-objects, storage-total-objects, storage-active-objects-sizes, storage-total-objects-sizes,
-                 num-of-msg-replicate, num-of-msg-sync-vnode, num-of-msg-rebalance,
+                 mq-num-of-msg-replicate, mq-num-of-msg-sync-vnode, mq-num-of-msg-rebalance,
                  vm-used-per-allocated-mem-1m, vm-allocated-mem-1m,
-                 vm-used-per-allocated-mem-5m, vm-allocated-mem-5m
+                 vm-used-per-allocated-mem-5m, vm-allocated-mem-5m,
+                 mq-num-of-msg-recovery-node, mq-num-of-msg-deletion-dir,
+                 mq-num-of-msg-async-deletion-dir, mq-num-of-msg-req-deletion-dir,
+                 mq-mdcr-num-of-msg-req-comp-metadata, mq-mdcr-num-of-msg-req-sync-obj,
+                 comp-state, comp-last-start-datetime, comp-last-end-datetime,
+                 comp-num-of-pending-targets, comp-num-of-ongoing-targets, comp-num-of-out-of-targets
         }
         STATUS current
         DESCRIPTION "leofs group"

apps/leo_storage/snmp/snmpa_storage_1/LEO-STORAGE.bin

@@ -0,0 +1 @@
+../snmpa_storage_0/LEO-STORAGE.bin