update windows define and accept snmp leaf (#1379)

apache · Dec 4, 2023 · b3623b4 · b3623b4
1 parent ee361c7
commit b3623b4
Show file tree

Hide file tree

Showing 2 changed files with 172 additions and 106 deletions.
diff --git a/collector/src/main/java/org/dromara/hertzbeat/collector/collect/snmp/SnmpCollectImpl.java b/collector/src/main/java/org/dromara/hertzbeat/collector/collect/snmp/SnmpCollectImpl.java
@@ -41,6 +41,8 @@
 import org.springframework.util.StringUtils;
 
 import java.io.IOException;
+import java.nio.Buffer;
+import java.nio.charset.Charset;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ExecutionException;
@@ -181,6 +183,15 @@ public void collect(CollectRep.MetricsData.Builder builder, long monitorId, Stri
                         } else {
                             String oid = oidMap.get(alias);
                             String value = oidsValueMap.get(oid);
+                            if (value == null) {
+                                // get leaf
+                                for (String key : oidsValueMap.keySet()) {
+                                    if (key.startsWith(oid)){
+                                        value = oidsValueMap.get(key);
+                                        break;
+                                    }
+                                }
+                            }
                             if (value != null) {
                                 valueRowBuilder.addColumns(value);
                             } else {