add STRING number support

mackerelio · Mar 28, 2024 · c2f0178 · c2f0178
1 parent 99db858
commit c2f0178
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 7 deletions.
diff --git a/mackerel-plugin-snmp/lib/snmp.go b/mackerel-plugin-snmp/lib/snmp.go
@@ -52,8 +52,11 @@ func (m SNMPPlugin) FetchMetrics() (map[string]interface{}, error) {
 
 		ret, err := strconv.ParseFloat(fmt.Sprint(resp.Variables[0].Value), 64)
 		if err != nil {
-			log.Println(err)
-			continue
+			ret, err = strconv.ParseFloat(fmt.Sprintf("%s", resp.Variables[0].Value), 64)
+			if err != nil {
+				log.Println(err)
+				continue
+			}
 		}
 
 		stat[sm.Metrics.Name] = ret

diff --git a/mackerel-plugin-snmp/rule.txt b/mackerel-plugin-snmp/rule.txt
@@ -1,2 +1,3 @@
 snmp.hrSystemNumUsers	>=0
 snmp.hrSystemProcesses	>=0
+snmp.echo	>0
diff --git a/mackerel-plugin-snmp/test.sh b/mackerel-plugin-snmp/test.sh
@@ -26,7 +26,7 @@ docker run --name "test-$plugin" -v $(pwd)/testdata/snmpd.conf:/etc/snmp/snmpd.c
 trap 'docker stop test-$plugin; docker rm test-$plugin; exit 1' 1 2 3 15
 sleep 10
 
-$plugin '.1.3.6.1.2.1.25.1.5.0:hrSystemNumUsers:0:0' '.1.3.6.1.2.1.25.1.6.0:hrSystemProcesses:0:0' | graphite-metric-test -f rule.txt
+$plugin '.1.3.6.1.2.1.25.1.5.0:hrSystemNumUsers:0:0' '.1.3.6.1.2.1.25.1.6.0:hrSystemProcesses:0:0' '.1.3.6.1.4.1.8072.1.3.2.3.1.2.4.101.99.104.111:echo:0:0' | graphite-metric-test -f rule.txt
 status=$?
 
 docker stop "test-$plugin"

diff --git a/mackerel-plugin-snmp/testdata/snmpd.conf b/mackerel-plugin-snmp/testdata/snmpd.conf
@@ -1,4 +1,7 @@
-view   systemonly  included   .1.3.6.1.2.1.1
-view   systemonly  included   .1.3.6.1.2.1.25.1
-
-rocommunity public  default    -V systemonly
+view   systemonly  included   .1.3.6.1.2.1.1
+view   systemonly  included   .1.3.6.1.2.1.25.1
+view   systemonly  included   .1.3.6.1.4.1.8072.1.3.2.3.1.2.4
+
+rocommunity public  default    -V systemonly
+
+extend echo /bin/echo '3.14'