nicolas/librenms
1
0
Fork 0
mirror of https://github.com/stylersnico/librenms.git synced 2026-07-28 16:04:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix coding style part 2

Browse Source
This commit is contained in:
Job Snijders
2015-07-14 17:41:54 +02:00
parent ad9590df9b
commit 361653aa81
731 changed files with 37529 additions and 33991 deletions
Download Patch File Download Diff File Expand all files Collapse all files
includes/polling/ipmi.inc.php
+38 -45
View File
@@ -2,59 +2,52 @@
$ipmi_rows = dbFetchRows("SELECT * FROM sensors WHERE device_id = ? AND poller_type='ipmi'", array($device['device_id']));
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');
$ipmi['type'] = get_dev_attrib($device,'ipmi_type');
echo("Fetching IPMI sensor data...");
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');
$ipmi['type'] = get_dev_attrib($device, 'ipmi_type');
echo 'Fetching IPMI sensor data...';
if ($config['own_hostname'] != $device['hostname'] || $ipmi['host'] != 'localhost')
{
$remote = " -H " . $ipmi['host'] . " -U " . $ipmi['user'] . " -P " . $ipmi['password'];
}
$results = external_exec($config['ipmitool'] . " -I ".$ipmi['type']." -c " . $remote . " sdr 2>/dev/null");
echo(" done.\n");
foreach (explode("\n",$results) as $row)
{
list($desc,$value,$type,$status) = explode(',',$row);
$ipmi_sensor[$desc][$config['ipmi_unit'][$type]]['value'] = $value;
$ipmi_sensor[$desc][$config['ipmi_unit'][$type]]['unit'] = $type;
}
foreach ($ipmi_rows as $ipmisensors)
{
echo("Updating IPMI sensor " . $ipmisensors['sensor_descr'] . "... ");
$sensor = $ipmi_sensor[$ipmisensors['sensor_descr']][$ipmisensors['sensor_class']]['value'];
$unit = $ipmi_sensor[$ipmisensors['sensor_descr']][$ipmisensors['sensor_class']]['unit'];
$rrd_file = get_sensor_rrd($device, $ipmisensors);
if (is_file($old_rrd_file))
{
rename($old_rrd_file, $rrd_file);
if ($config['own_hostname'] != $device['hostname'] || $ipmi['host'] != 'localhost') {
$remote = ' -H '.$ipmi['host'].' -U '.$ipmi['user'].' -P '.$ipmi['password'];
}
if (!is_file($rrd_file))
{
rrdtool_create($rrd_file,"--step 300 \
DS:sensor:GAUGE:600:-20000:20000 ".$config['rrd_rra']);
$results = external_exec($config['ipmitool'].' -I '.$ipmi['type'].' -c '.$remote.' sdr 2>/dev/null');
echo " done.\n";
foreach (explode("\n", $results) as $row) {
list($desc,$value,$type,$status) = explode(',', $row);
$ipmi_sensor[$desc][$config['ipmi_unit'][$type]]['value'] = $value;
$ipmi_sensor[$desc][$config['ipmi_unit'][$type]]['unit'] = $type;
}
echo($sensor . " $unit\n");
foreach ($ipmi_rows as $ipmisensors) {
echo 'Updating IPMI sensor '.$ipmisensors['sensor_descr'].'... ';
rrdtool_update($rrd_file,"N:$sensor");
$sensor = $ipmi_sensor[$ipmisensors['sensor_descr']][$ipmisensors['sensor_class']]['value'];
$unit = $ipmi_sensor[$ipmisensors['sensor_descr']][$ipmisensors['sensor_class']]['unit'];
// FIXME warnings in event & mail not done here yet!
$rrd_file = get_sensor_rrd($device, $ipmisensors);
dbUpdate(array('sensor_current' => $sensor), 'sensors', 'poller_type = ? AND sensor_class = ? AND sensor_id = ?', array('ipmi', $ipmisensors['sensor_class'], $ipmisensors['sensor_id']));
if (is_file($old_rrd_file)) {
rename($old_rrd_file, $rrd_file);
}
}
if (!is_file($rrd_file)) {
rrdtool_create(
$rrd_file,
'--step 300 \
DS:sensor:GAUGE:600:-20000:20000 '.$config['rrd_rra']
);
}
unset($ipmi_sensor);
echo $sensor." $unit\n";
rrdtool_update($rrd_file, "N:$sensor");
// FIXME warnings in event & mail not done here yet!
dbUpdate(array('sensor_current' => $sensor), 'sensors', 'poller_type = ? AND sensor_class = ? AND sensor_id = ?', array('ipmi', $ipmisensors['sensor_class'], $ipmisensors['sensor_id']));
}
unset($ipmi_sensor);
}
?>