Ignore scalar .0 removal for all numeric oids

murrant · murrant · commit 89098b72c5e1 · 2025-01-22T08:17:04.000-06:00
diff --git a/LibreNMS/Device/YamlDiscovery.php b/LibreNMS/Device/YamlDiscovery.php
@@ -254,7 +254,7 @@ public static function getValueFromData($name, $index, $discovery_data, $pre_cac
         }
 
         // if index is 0 and this is a scalar value, remove the scalar .0
-        if ($index == 0 && str_ends_with($name, '.0')) {
+        if ($index == 0 && str_ends_with($name, '.0') && ! Oid::of($name)->isNumeric()) {
             $name = substr($name, 0, -2);
         }
 

Original file line number	Diff line number	Diff line change
`@@ -254,7 +254,7 @@ public static function getValueFromData($name, $index, $discovery_data, $pre_cac`
`254`	`254`	`}`
`255`	`255`
`256`	`256`	`// if index is 0 and this is a scalar value, remove the scalar .0`
`257`		`- if ($index == 0 && str_ends_with($name, '.0')) {`
	`257`	`+ if ($index == 0 && str_ends_with($name, '.0') && ! Oid::of($name)->isNumeric()) {`
`258`	`258`	`$name = substr($name, 0, -2);`
`259`	`259`	`}`
`260`	`260`