From 700088ae6fb34374a98256137cca6cfe3b22dfdc Mon Sep 17 00:00:00 2001
From: lgq <1015864684@qq.com>
Date: 星期三, 16 七月 2025 15:47:32 +0800
Subject: [PATCH] 1.修改snmp脚本,在monitor.sh中添加snmp启动判断

---
 local/bin/snmp_val.sh            |    8 ++++----
 local/monitor.sh                 |   14 ++++++++++++--
 local/bin/snmp_cfg               |    0 
 local/script/start_snmpd         |    2 +-
 local/www/cgi-bin/snmp/query_oid |    9 ++++-----
 local/bin/snmpd                  |    0 
 6 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/local/bin/snmp_cfg b/local/bin/snmp_cfg
index 165cd67..082fb1e 100755
--- a/local/bin/snmp_cfg
+++ b/local/bin/snmp_cfg
Binary files differ
diff --git a/local/bin/snmp_val.sh b/local/bin/snmp_val.sh
index 837dfba..f4f84ce 100755
--- a/local/bin/snmp_val.sh
+++ b/local/bin/snmp_val.sh
@@ -5,7 +5,7 @@
 
 # 鑾峰彇浼犲叆鐨� OID
 OID="$1"
-jsoner=./jsoner
+#jsoner=/usr/local/bin/jsoner
 
 #echo "鑴氭湰琚皟鐢�, OID: $OID"
 chn=${OID##*.}
@@ -17,17 +17,17 @@
 chn=`expr $chn - 1 `
 
 #echo "$jsoner -g /tmp/$id value-$chn.value" 
-val=`$jsoner -g /tmp/$id value-$chn.value`
+val=`jsoner -g /tmp/$id value-$chn.value`
 ret=$?
 #echo "ret = $ret"
 
 if [ $ret -eq 0 ]
 then 
-	RESPONSE="{\"dataType\": \"OctetString\", \"value\": \"$val\" }"
+	RESPONSE="{\"type\": \"OctetString\", \"value\": \"$val\" }"
 	echo "$RESPONSE"
 
 else 
 	# 榛樿杩斿洖
-	RESPONSE="{\"dataType\": \"OctetString\", \"value\": \"noData\"}"
+	RESPONSE="{\"type\": \"OctetString\", \"value\": \"noData\"}"
 	echo "$RESPONSE"
 fi
\ No newline at end of file
diff --git a/local/bin/snmpd b/local/bin/snmpd
new file mode 100755
index 0000000..9b6cc78
--- /dev/null
+++ b/local/bin/snmpd
Binary files differ
diff --git a/local/monitor.sh b/local/monitor.sh
index caf9951..5c0f7d0 100755
--- a/local/monitor.sh
+++ b/local/monitor.sh
@@ -46,8 +46,18 @@
 				$app_path/$proName &
 			fi
  	    else 
-	        $app_path/$proName &
-        fi
+	        
+	        if [ $proName = "snmp" ]
+	        then
+			    enable=`jsoner -g /work/sysConfig.json snmp`
+			    if [ $enable -eq 1 ]
+			    then
+				    $app_path/$proName &
+			    fi
+ 	        else 
+	            $app_path/$proName &
+            fi
+		fi	
 	else
             echo "start back $proName"
 	    $backup_path/$proName &
diff --git a/local/script/start_snmpd b/local/script/start_snmpd
index ded1017..5b45c74 100755
--- a/local/script/start_snmpd
+++ b/local/script/start_snmpd
@@ -1 +1 @@
-/usr/sbin/snmpd run-server  --bindTo 0.0.0.0:161  --configFile /work/snmp.json --logLevel=error >/tmp/log
+/usr/local/bin/snmpd run-server  --bindTo 0.0.0.0:161  --configFile /work/snmp.json --logLevel=error >/tmp/log
diff --git a/local/www/cgi-bin/snmp/query_oid b/local/www/cgi-bin/snmp/query_oid
index a3e855f..7f70c08 100755
--- a/local/www/cgi-bin/snmp/query_oid
+++ b/local/www/cgi-bin/snmp/query_oid
@@ -19,12 +19,11 @@
     printf "    \"device\": \"%s\",\n", $1
     printf "    \"oid\": \"%s\",\n", $2
     printf "    \"index1\": %d,\n", $3
-    printf "    \"type\": %d,\n", $4
-    printf "    \"index2\": %d,\n", $5
-    printf "    \"param\": \"%s\"", $6
+    printf "    \"index2\": %d,\n", $4
+    printf "    \"param\": \"%s\"", $5
     # 澶勭悊鍗曚綅瀛楁锛堢6鍒楋級
-    if (NF >= 7 && $7 != "") {
-        printf ",\n    \"unit\": \"%s\"\n", $7
+    if (NF >= 6 && $6 != "") {
+        printf ",\n    \"unit\": \"%s\"\n", $6
     } else {
         printf "\n"
     }

--
Gitblit v1.9.3