Misc fixes in legacy codebase (librenms#18251)

Jellyfrog · web-flow · commit 846f757e8a27 · 2025-09-17T16:00:35.000+02:00
* Misc fixes in legacy codebase

* Apply fixes from StyleCI

* Implement agent sensor value assignment

Add handling for agent sensors and log if no agent data is available.

* Remove unused variable 'mib' if set

* Apply fixes from StyleCI
diff --git a/includes/discovery/junose-atm-vp.inc.php b/includes/discovery/junose-atm-vp.inc.php
@@ -17,7 +17,7 @@
             $port_id = dbFetchCell('SELECT `port_id` FROM `ports` WHERE `device_id` = ? AND `ifIndex` = ?', [$device['device_id'], $ifIndex]);
 
             if (is_numeric($port_id) && is_numeric($vp_id)) {
-                discover_juniAtmvp($valid_vp, $device['device_id'], $port_id, $vp_id, null);
+                discover_juniAtmVp($valid_vp, $device['device_id'], $port_id, $vp_id, null);
             }
         } //end foreach
     } //end if
diff --git a/includes/discovery/sensors/count/fortigate.inc.php b/includes/discovery/sensors/count/fortigate.inc.php
@@ -20,7 +20,7 @@
  */
 
 // Sensors for license status
-$licenseOids = SnmpQuery::hideMIB()->walk('FORTINET-FORTIGATE-MIB::fgSystemInfoAdvanced')->table(1);
+$licenseOids = SnmpQuery::hideMib()->walk('FORTINET-FORTIGATE-MIB::fgSystemInfoAdvanced')->table(1);
 
 if (! empty($licenseOids)) {
     foreach ($licenseOids as $index => $entry) {
diff --git a/includes/discovery/sensors/current/ocnos.inc.php b/includes/discovery/sensors/current/ocnos.inc.php
@@ -1,5 +1,7 @@
 <?php
 
+use LibreNMS\OS;
+
 if (empty($os)) {
     $os = OS::make($device);
 }
diff --git a/includes/discovery/sensors/dbm/ocnos.inc.php b/includes/discovery/sensors/dbm/ocnos.inc.php
@@ -1,5 +1,7 @@
 <?php
 
+use LibreNMS\OS;
+
 if (empty($os)) {
     $os = OS::make($device);
 }
diff --git a/includes/discovery/sensors/percent/fortigate.inc.php b/includes/discovery/sensors/percent/fortigate.inc.php
@@ -16,11 +16,11 @@
  * @author     Rudy Broersma
  */
 
-$fgDhcpTables = SnmpQuery::hideMIB()->walk('FORTINET-FORTIGATE-MIB::fgDhcpTables')->table(0);
+$fgDhcpTables = SnmpQuery::hideMib()->walk('FORTINET-FORTIGATE-MIB::fgDhcpTables')->table(0);
 
 if (! empty($fgDhcpTables['fgDhcpLeaseUsage'])) {
     foreach ($fgDhcpTables['fgDhcpLeaseUsage'] as $vdomID => $table) {
-        $vdomName = SnmpQuery::enumStrings()->hideMIB()->get('FORTINET-FORTIGATE-MIB:fgVdEntName.' . $vdomID)->value();
+        $vdomName = SnmpQuery::enumStrings()->hideMib()->get('FORTINET-FORTIGATE-MIB:fgVdEntName.' . $vdomID)->value();
 
         foreach ($table as $index => $value) {
             $indexSplit = explode('.', $index);
diff --git a/includes/discovery/sensors/state/fortigate.inc.php b/includes/discovery/sensors/state/fortigate.inc.php
@@ -33,7 +33,7 @@
     $fgHaStatsIndex_num = '.1.3.6.1.4.1.12356.101.13.2.1.1.1';
 
     // Fetch the cluster members
-    $haStatsEntries = SnmpQuery::hideMIB()->walk('FORTINET-FORTIGATE-MIB::fgHaStatsIndex')->table(1);
+    $haStatsEntries = SnmpQuery::hideMib()->walk('FORTINET-FORTIGATE-MIB::fgHaStatsIndex')->table(1);
 
     // As of July 2024:
     // FortiNet considers a single-node cluster a valid setup. Therefor, if a cluster node is removed or
diff --git a/includes/discovery/sensors/state/hp.inc.php b/includes/discovery/sensors/state/hp.inc.php
@@ -54,7 +54,7 @@
     if (! empty($temp)) {
         //Create State Index
         $state_name = $oid;
-        $state_index_id = create_state_index($state_name, $states);
+        create_state_index($state_name, $states);
 
         foreach ($temp as $index => $entry) {
             $drive_bay = snmp_get($device, "cpqDaPhyDrvBay.$index", '-Ovqn', 'CPQIDA-MIB', 'hp');
diff --git a/includes/discovery/sensors/state/loop-telecom.inc.php b/includes/discovery/sensors/state/loop-telecom.inc.php
@@ -83,7 +83,7 @@
         'ctrl' => 100,
     ];
 
-    $test = create_state_index($state_name, $states);
+    create_state_index($state_name, $states);
     $num_oid = '.1.3.6.1.4.1.823.34441.1.9.1.9.';
     $num_index = 1; //Create a seperate index since $index = the slotname and not the number.
     foreach ($oids as $index => $entry) {
diff --git a/includes/discovery/sensors/temperature/ocnos.inc.php b/includes/discovery/sensors/temperature/ocnos.inc.php
@@ -1,5 +1,7 @@
 <?php
 
+use LibreNMS\OS;
+
 if (empty($os)) {
     $os = OS::make($device);
 }
diff --git a/includes/discovery/sensors/voltage/ocnos.inc.php b/includes/discovery/sensors/voltage/ocnos.inc.php
@@ -1,5 +1,7 @@
 <?php
 
+use LibreNMS\OS;
+
 if (empty($os)) {
     $os = OS::make($device);
 }
diff --git a/includes/html/api_functions.inc.php b/includes/html/api_functions.inc.php
@@ -2209,7 +2209,7 @@ function add_port_group(Illuminate\Http\Request $request)
         return api_error(422, $v->messages());
     }
 
-    $portGroup = PortGroup::make(['name' => $data['name'], 'desc' => $data['desc']]);
+    $portGroup = new PortGroup(['name' => $data['name'], 'desc' => $data['desc']]);
     $portGroup->save();
 
     return api_success($portGroup->id, 'id', 'Port group ' . $portGroup->name . ' created', 201);
@@ -2326,7 +2326,7 @@ function add_device_group(Illuminate\Http\Request $request)
         }
     }
 
-    $deviceGroup = DeviceGroup::make(['name' => $data['name'], 'type' => $data['type'], 'desc' => $data['desc']]);
+    $deviceGroup = new DeviceGroup(['name' => $data['name'], 'type' => $data['type'], 'desc' => $data['desc']]);
     if ($data['type'] == 'dynamic') {
         $deviceGroup->rules = json_decode($data['rules']);
     }
@@ -2807,7 +2807,7 @@ function get_nac(Illuminate\Http\Request $request)
         return api_error(404, "Device $hostname not found");
     }
 
-    return check_device_permission($device_id, function () use ($device) {
+    return check_device_permission($device, function () use ($device) {
         $nac = $device->portsNac;
 
         return api_success($nac, 'ports_nac');
@@ -3195,7 +3195,7 @@ function add_service_template_for_device_group(Illuminate\Http\Request $request)
         return api_error(500, "We couldn't parse your rule");
     }
 
-    $serviceTemplate = ServiceTemplate::make(['name' => $data['name'], 'device_group_id' => $data['device_group_id'], 'type' => $data['type'], 'param' => $data['param'], 'ip' => $data['ip'], 'desc' => $data['desc'], 'changed' => $data['changed'], 'disabled' => $data['disabled'], 'ignore' => $data['ignore']]);
+    $serviceTemplate = new ServiceTemplate(['name' => $data['name'], 'device_group_id' => $data['device_group_id'], 'type' => $data['type'], 'param' => $data['param'], 'ip' => $data['ip'], 'desc' => $data['desc'], 'changed' => $data['changed'], 'disabled' => $data['disabled'], 'ignore' => $data['ignore']]);
     $serviceTemplate->save();
 
     return api_success($serviceTemplate->id, 'id', 'Service Template ' . $serviceTemplate->name . ' created', 201);
diff --git a/includes/html/functions.inc.php b/includes/html/functions.inc.php
@@ -979,7 +979,7 @@ function lowest_time($time, $seconds = 300)
 /**
  * @params int
  *
- * @return string
+ * @return string|void
  *
  * This returns the subpath for working with nfdump.
  *
@@ -1048,7 +1048,7 @@ function nfsen_hostname($hostname)
 /**
  * @params string hostname
  *
- * @return string
+ * @return string|void
  *
  * Takes a hostname and returns the path to the nfsen
  * live dir.
diff --git a/includes/html/graphs/application/http_access_log_combined_bytes_stats.inc.php b/includes/html/graphs/application/http_access_log_combined_bytes_stats.inc.php
@@ -3,10 +3,6 @@
 $unit_text = 'Bytes';
 
 $stats_list = [
-    'bytes_max' => [
-        'stat' => 'bytes_max',
-        'descr' => 'Max',
-    ],
     'bytes_mean' => [
         'stat' => 'bytes_mean',
         'descr' => 'Mean',
diff --git a/includes/html/graphs/generic_multi_seperated.inc.php b/includes/html/graphs/generic_multi_seperated.inc.php
@@ -81,7 +81,7 @@
 }
 
 if ($previous) {
-    $rrd_options .= sprintf(" COMMENT:'\t'", '');
+    $rrd_options .= sprintf(" COMMENT:'\t'");
     $rrd_options .= sprintf(" COMMENT:'%10s'", 'P Avg');
     $rrd_options .= sprintf(" COMMENT:'%10s'", 'P Max');
     if (! $nototal) {
diff --git a/includes/html/graphs/sensor/generic.inc.php b/includes/html/graphs/sensor/generic.inc.php
@@ -1,6 +1,7 @@
 <?php
 
 use LibreNMS\Data\Store\Rrd;
+use LibreNMS\Exceptions\RrdGraphException;
 use LibreNMS\Util\Number;
 
 if (empty($sensor)) {
diff --git a/includes/html/pages/device/apps/zfs.inc.php b/includes/html/pages/device/apps/zfs.inc.php
@@ -70,7 +70,6 @@
         'zfs_l2_d_to_m_ratio' => 'L2 Data To Meta Ratio',
         'zfs_l2_access_total' => 'L2 Total Hits And Misses Per Second',
         'zfs_l2_errors' => 'L2 Errors Per Second',
-        'zfs_l2_errors' => 'L2 Error Types Per Second',
         'zfs_l2_sizes' => 'L2 Sizes',
         'zfs_l2_asize' => 'L2 Asize',
         'zfs_l2_bufc_d_asize' => 'L2 BufC Data Asize',
diff --git a/includes/html/pages/device/overview/ping.inc.php b/includes/html/pages/device/overview/ping.inc.php
@@ -1,7 +1,7 @@
 <?php
 
 if (Rrd::checkRrdExists(Rrd::name(DeviceCache::getPrimary()->hostname, 'icmp-perf'))) {
-    $perf_url = Url('device') . '/device=' . DeviceCache::getPrimary()->device_id . '/tab=graphs/group=poller/';
+    $perf_url = url('device') . '/device=' . DeviceCache::getPrimary()->device_id . '/tab=graphs/group=poller/';
     echo '
         <div class="row">
         <div class="col-md-12">
diff --git a/includes/html/pages/device/routing/bgp.inc.php b/includes/html/pages/device/routing/bgp.inc.php
@@ -220,7 +220,7 @@
 
     $link_array = $graph_array;
     $link_array['page'] = 'graphs';
-    unset($link_array['height'], $link_array['width'], $link_array['legend']);
+    unset($link_array['height'], $link_array['width']);
     $link = \LibreNMS\Util\Url::generate($link_array);
     $peeraddresslink = '<span class=list-large>' . \LibreNMS\Util\Url::overlibLink($link, $peerIdentifierIp?->compressed(), \LibreNMS\Util\Url::graphTag($graph_array_zoom)) . '</span>';
 
diff --git a/includes/html/table/alertlog-stats.inc.php b/includes/html/table/alertlog-stats.inc.php
@@ -36,7 +36,7 @@
     $sql = " FROM `alert_log` AS E LEFT JOIN devices AS D ON E.device_id=D.device_id RIGHT JOIN alert_rules AS R ON E.rule_id=R.id WHERE $where";
 } else {
     $device_ids = Permissions::devicesForUser()->toArray() ?: [0];
-    // @phpstan-ignore-next-line
+    // @phpstan-ignore function.deprecated
     $sql = " FROM `alert_log` AS E LEFT JOIN devices AS D ON E.device_id=D.device_id RIGHT JOIN alert_rules AS R ON E.rule_id=R.id WHERE $where AND E.device_id IN " . dbGenPlaceholders(count($device_ids));
     $param = array_merge($param, $device_ids);
 }
diff --git a/includes/html/table/alertlog.inc.php b/includes/html/table/alertlog.inc.php
@@ -98,7 +98,7 @@
     // If it's a new rule created, or a clear/RECOVERED
     if ($alert_state == '0') {
         // Get the latest active that is not a clear/RECOVERED
-        // @phpstan-ignore-next-line
+        // @phpstan-ignore function.deprecated
         $last_active_state = dbFetchRows('SELECT id, details FROM alert_log WHERE device_id = ? AND id < ? AND rule_id = ? AND `state` != 0 ORDER BY id DESC LIMIT 1', [$alertlog['device_id'], $alertlog['alert_log_id'], $alertlog['rule_id']]);
         // It's a real alarm, we can then used it for the details
         if ($last_active_state) {
diff --git a/includes/nfs-shared.inc.php b/includes/nfs-shared.inc.php
@@ -251,7 +251,6 @@
 // list of stats that are gauges
 $gauge_stats = [
     'server_cache_CacheSize' => 1,
-    'server_Clients' => 1,
     'server_cache_TCPPeak' => 1,
     'client_Delegs' => 1,
     'client_Layouts' => 1,
@@ -815,7 +814,6 @@
         '' => [
             'server_cache_CacheSize' => 'CacheSize',
             'server_cache_Inprog' => 'Inprog',
-            'server_cache_Misses' => 'Misses',
             'server_cache_Non-idem' => 'Non-idem',
             'server_cache_TCPPeak' => 'TCPPeak',
             'server_cache_hits' => 'Hits',
diff --git a/includes/polling/functions.inc.php b/includes/polling/functions.inc.php
@@ -100,7 +100,9 @@ function poll_sensor($device, $class)
                     }
                 }
             }//end if
-            unset($mib);
+            if (isset($mib)) {
+                unset($mib);
+            }
             unset($mibdir);
             $sensor['new_value'] = $sensor_value;
             $all_sensors[] = $sensor;
diff --git a/includes/rewrites.php b/includes/rewrites.php
@@ -205,7 +205,7 @@ function get_nagios_state($descr)
 
 /**
  * @param  $state
- * @return int
+ * @return int|void
  */
 function apc_relay_state($state)
 {

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`	$port_id = dbFetchCell('SELECT `port_id` FROM `ports` WHERE `device_id` = ? AND `ifIndex` = ?', [$device['device_id'], $ifIndex]);
`18`	`18`
`19`	`19`	`if (is_numeric($port_id) && is_numeric($vp_id)) {`
`20`		`- discover_juniAtmvp($valid_vp, $device['device_id'], $port_id, $vp_id, null);`
	`20`	`+ discover_juniAtmVp($valid_vp, $device['device_id'], $port_id, $vp_id, null);`
`21`	`21`	`}`
`22`	`22`	`} //end foreach`
`23`	`23`	`} //end if`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,7 @@`
`1`	`1`	`<?php`
`2`	`2`
	`3`	`+use LibreNMS\OS;`
	`4`	`+`
`3`	`5`	`if (empty($os)) {`
`4`	`6`	`$os = OS::make($device);`
`5`	`7`	`}`