From 5cbd7d1c2ffe112d66ec026cf84946936fc8fd43 Mon Sep 17 00:00:00 2001
From: Jonathan Karras <karrots@users.noreply.github.com>
Date: Fri, 5 Jun 2020 17:06:02 -0600
Subject: [PATCH] Fix temperature discovery for APC cooling units

Update various APC discovery to use pre_cache.
---
 includes/discovery/sensors/fanspeed/apc.inc.php    | 2 +-
 includes/discovery/sensors/power/apc.inc.php       | 2 +-
 includes/discovery/sensors/temperature/apc.inc.php | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/includes/discovery/sensors/fanspeed/apc.inc.php b/includes/discovery/sensors/fanspeed/apc.inc.php
index 68e5e73e33..15dee9817b 100644
--- a/includes/discovery/sensors/fanspeed/apc.inc.php
+++ b/includes/discovery/sensors/fanspeed/apc.inc.php
@@ -23,7 +23,7 @@
  * @author     Neil Lathwood <neil@lathwood.co.uk>
  */
 
-foreach ($cooling_unit_analog as $index => $data) {
+foreach ($pre_cache['cooling_unit_analog'] as $index => $data) {
     $cur_oid = '.1.3.6.1.4.1.318.1.1.27.1.4.1.2.1.3.' . $index;
     $descr = $data['coolingUnitStatusAnalogDescription'];
     $scale = $data['coolingUnitStatusAnalogScale'];
diff --git a/includes/discovery/sensors/power/apc.inc.php b/includes/discovery/sensors/power/apc.inc.php
index db2bb3fb63..01a359ddc0 100644
--- a/includes/discovery/sensors/power/apc.inc.php
+++ b/includes/discovery/sensors/power/apc.inc.php
@@ -23,7 +23,7 @@
  * @author     Neil Lathwood <neil@lathwood.co.uk>
  */
 
-foreach ($cooling_unit_analog as $index => $data) {
+foreach ($pre_cache['cooling_unit_analog'] as $index => $data) {
     $cur_oid = '.1.3.6.1.4.1.318.1.1.27.1.4.1.2.1.3.' . $index;
     $descr = $data['coolingUnitStatusAnalogDescription'];
     $scale = $data['coolingUnitStatusAnalogScale'];
diff --git a/includes/discovery/sensors/temperature/apc.inc.php b/includes/discovery/sensors/temperature/apc.inc.php
index eae79b0632..3d2ae4bab7 100644
--- a/includes/discovery/sensors/temperature/apc.inc.php
+++ b/includes/discovery/sensors/temperature/apc.inc.php
@@ -154,7 +154,8 @@ foreach ($cooling_unit as $index => $data) {
     }
 }
 
-foreach ($cooling_unit_analog as $index => $data) {
+
+foreach ($pre_cache['cooling_unit_analog'] as $index => $data) {
     $cur_oid = '.1.3.6.1.4.1.318.1.1.27.1.4.1.2.1.3.' . $index;
     $descr = $data['coolingUnitStatusAnalogDescription'];
     $scale = $data['coolingUnitStatusAnalogScale'];