From 40f25aa17a96fe7cabc0acc01fcbb253af4d90a6 Mon Sep 17 00:00:00 2001
From: Neil Lathwood <neil@lathwood.co.uk>
Date: Tue, 8 Aug 2017 21:31:22 +0100
Subject: [PATCH] fix: Fixed Raspberry Pi sensors (#7131)

* fix: Fixing Raspberry Pi sensors

* Update linux.inc.php

* Update linux.inc.php

* Update linux.inc.php
---
 includes/discovery/sensors/frequency/linux.inc.php | 2 +-
 includes/discovery/sensors/pre-cache/linux.inc.php | 2 +-
 includes/discovery/sensors/state/linux.inc.php     | 4 ++--
 includes/discovery/sensors/voltage/linux.inc.php   | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/includes/discovery/sensors/frequency/linux.inc.php b/includes/discovery/sensors/frequency/linux.inc.php
index 8fddecf5fb..da9cb248ea 100644
--- a/includes/discovery/sensors/frequency/linux.inc.php
+++ b/includes/discovery/sensors/frequency/linux.inc.php
@@ -15,7 +15,7 @@ for ($freq = 6; $freq < 8; $freq++) {
             $descr = "Core";
             break;
     }
-    $value = current($pre_cache['raspberry_pi_sensors'][$oid.$freq]);
+    $value = current($pre_cache['raspberry_pi_sensors']["raspberry.".$freq]);
     if (is_numeric($value)) {
         discover_sensor($valid['sensor'], 'frequency', $device, $oid.$freq, $freq, $sensor_type, $descr, 1, 1, null, null, null, null, $value);
     } else {
diff --git a/includes/discovery/sensors/pre-cache/linux.inc.php b/includes/discovery/sensors/pre-cache/linux.inc.php
index e1978e758a..e852c6e588 100644
--- a/includes/discovery/sensors/pre-cache/linux.inc.php
+++ b/includes/discovery/sensors/pre-cache/linux.inc.php
@@ -24,4 +24,4 @@
  */
 
 echo 'RaspberryPi ';
-$pre_cache['raspberry_pi_sensors'] = snmpwalk_cache_oid_num($device, '.1.3.6.1.4.1.8072.1.3.2.4.1.2.9.114.97.115.112.98.101.114.114.121', array());
+$pre_cache['raspberry_pi_sensors'] = snmpwalk_cache_oid($device, '.1.3.6.1.4.1.8072.1.3.2.4.1.2.9.114.97.115.112.98.101.114.114.121', array());
diff --git a/includes/discovery/sensors/state/linux.inc.php b/includes/discovery/sensors/state/linux.inc.php
index 2757147b1c..15b7e46aff 100644
--- a/includes/discovery/sensors/state/linux.inc.php
+++ b/includes/discovery/sensors/state/linux.inc.php
@@ -4,7 +4,7 @@
  * requires snmp extend agent script from librenms-agent
  */
 $state = "raspberry_codec";
-$oid = '1.3.6.1.4.1.8072.1.3.2.4.1.2.9.114.97.115.112.98.101.114.114.121.';
+$oid = '.1.3.6.1.4.1.8072.1.3.2.4.1.2.9.114.97.115.112.98.101.114.114.121.';
 for ($codec = 8; $codec < 14; $codec++) {
     switch ($codec) {
         case "8":
@@ -26,7 +26,7 @@ for ($codec = 8; $codec < 14; $codec++) {
             $descr = "WMV9 codec";
             break;
     }
-    $value = current($pre_cache['raspberry_pi_sensors'][$oid.$codec]);
+    $value = current($pre_cache['raspberry_pi_sensors']["raspberry.".$codec]);
     if (stripos($value, 'abled') !== false) {
         $state_index_id = create_state_index($state);
         if ($state_index_id) {
diff --git a/includes/discovery/sensors/voltage/linux.inc.php b/includes/discovery/sensors/voltage/linux.inc.php
index b9cbc63138..20ad621092 100644
--- a/includes/discovery/sensors/voltage/linux.inc.php
+++ b/includes/discovery/sensors/voltage/linux.inc.php
@@ -20,7 +20,7 @@ for ($volt = 2; $volt < 6; $volt++) {
             $descr = "SDRAMp";
             break;
     }
-    $value = current($pre_cache['raspberry_pi_sensors'][$oid.$volt]);
+    $value = current($pre_cache['raspberry_pi_sensors']["raspberry.".$volt]);
     if (is_numeric($value)) {
         discover_sensor($valid['sensor'], 'voltage', $device, $oid.$volt, $volt, $sensor_type, $descr, '1', '1', null, null, null, null, $value);
     } else {