From 591983ac75879e4bfede1f7cc044b843eed867e8 Mon Sep 17 00:00:00 2001 From: Tony Murray Date: Fri, 22 Jul 2016 00:26:02 -0500 Subject: [PATCH 1/2] Fix incorrect thresholds The initial value was fetched incorrectly --- includes/discovery/sensors/temperatures/ibm-amm.inc.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/includes/discovery/sensors/temperatures/ibm-amm.inc.php b/includes/discovery/sensors/temperatures/ibm-amm.inc.php index af5c020e83..45becf70e7 100644 --- a/includes/discovery/sensors/temperatures/ibm-amm.inc.php +++ b/includes/discovery/sensors/temperatures/ibm-amm.inc.php @@ -12,7 +12,7 @@ if ($device['os'] == 'ibm-amm') { $oid = 'BLADE-MIB::mmTemp.0'; - $mmtemp = snmp_get($device, $oid, '-OsqnU'); + $mmtemp = snmp_get($device, $oid, '-Oqv'); preg_match('/[\d\.]+/', $mmtemp, $temp_response); if (!empty($temp_response[0])) { @@ -29,7 +29,7 @@ if ($device['os'] == 'ibm-amm') { } $oid = 'BLADE-MIB::frontPanelTemp.0'; - $fptemp = snmp_get($device, $oid, '-OsqnU'); + $fptemp = snmp_get($device, $oid, '-Oqv'); preg_match('/[\d\.]+/', $fptemp, $temp_response); if (!empty($temp_response[0])) { From f10d74f3726bccca7e39c0acb60f5d5884df049f Mon Sep 17 00:00:00 2001 From: Tony Murray Date: Fri, 22 Jul 2016 10:09:10 -0500 Subject: [PATCH 2/2] Validate.php timezone failure Move the timezone into the constructor. --- validate.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/validate.php b/validate.php index 9efdb54b59..65ebe89565 100755 --- a/validate.php +++ b/validate.php @@ -76,8 +76,7 @@ $versions = version_info(); echo "Version info:\n"; $cur_sha = $versions['local_sha']; if ($config['update_channel'] == 'master' && $cur_sha != $versions['github']['sha']) { - $commit_date = new DateTime($versions['local_date']); - $commit_date->setTimezone(new DateTimeZone(date_default_timezone_get())); + $commit_date = new DateTime($versions['local_date'], new DateTimeZone(date_default_timezone_get())); print_warn("Your install is out of date: $cur_sha " . $commit_date->format('(r)')); } else {