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 rrd-create-remote

Browse Source
This commit is contained in:
Tony Murray
2016-07-18 15:56:49 -05:00
parent 0a8acc7649 c9a4e9daa1
commit 1f5cfe283e
51 changed files with 1449 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
includes/polling/ipmi.inc.php
View File

@@ -2,6 +2,8 @@
$ipmi_rows = dbFetchRows("SELECT * FROM sensors WHERE device_id = ? AND poller_type='ipmi'", array($device['device_id']));
d_echo($ipmi_rows);
if ($ipmi['host'] = get_dev_attrib($device, 'ipmi_hostname')) {
$ipmi['user'] = get_dev_attrib($device, 'ipmi_username');
$ipmi['password'] = get_dev_attrib($device, 'ipmi_password');
@@ -13,6 +15,7 @@ if ($ipmi['host'] = get_dev_attrib($device, 'ipmi_hostname')) {
}
$results = external_exec($config['ipmitool'].' -I '.$ipmi['type'].' -c '.$remote.' sdr 2>/dev/null');
d_echo($results);
echo " done.\n";
foreach (explode("\n", $results) as $row) {