mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into app-pdns-recursor

Browse Source
This commit is contained in:
Tony Murray
2016-07-22 18:24:21 -05:00
parent a8d66ddf72 0e36a663f8
commit 9bc89bb668
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
includes/discovery/sensors/temperatures/ibm-amm.inc.php
+2 -2
View File
@@ -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])) {
validate.php
+1 -2
View File
@@ -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 {