diff --git a/LibreNMS/Data/Source/Ipmitool.php b/LibreNMS/Data/Source/Ipmitool.php index abcd42dcbdf657bbe4d1339e24bb5c81cb25d119..5529eeb61beba654119e960497f5943dfe0345bf 100644 --- a/LibreNMS/Data/Source/Ipmitool.php +++ b/LibreNMS/Data/Source/Ipmitool.php @@ -1,4 +1,5 @@ binary = LibrenmsConfig::get('ipmitool', 'ipmitool'); $this->hostname = $device->getAttrib('ipmi_hostname', $device->hostname); $this->port = filter_var($device->getAttrib('ipmi_port'), FILTER_VALIDATE_INT) ?: 0; - $this->username = $device->getAttrib('ipmi_username', '') ; + $this->username = $device->getAttrib('ipmi_username', ''); $this->password = $device->getAttrib('ipmi_password', ''); $this->kg_key = $device->getAttrib('ipmi_kg_key'); $this->ciphersuite = $device->getAttrib('ipmi_ciphersuite'); @@ -74,6 +74,7 @@ class Ipmitool /** * @param string[] $commands * @return string + * * @throws IpmiConnectionFailed */ public function command(array $commands): string @@ -111,6 +112,7 @@ class Ipmitool * descr, value, unit, status, detail * * @return list + * * @throws IpmiConnectionFailed */ public function sdr(): array @@ -118,7 +120,7 @@ class Ipmitool $output = $this->command(['-c', 'sdr']); return array_map( - fn(string $line): array => array_pad(array_values(array_map(trim(...), str_getcsv($line, escape: ''))), 5, null), + fn (string $line): array => array_pad(array_values(array_map(trim(...), str_getcsv($line, escape: ''))), 5, null), array_filter(explode("\n", trim($output))) ); } @@ -127,6 +129,7 @@ class Ipmitool * desc, current, unit, state, low_nonrecoverable, low_limit, low_warn, high_warn, high_limit, high_nonrecoverable * * @return list + * * @throws IpmiConnectionFailed */ public function sensors(): array @@ -134,7 +137,7 @@ class Ipmitool $output = $this->command(['sensor']); return array_map( - fn(string $line): array => array_map(trim(...), explode('|', $line)), + fn (string $line): array => array_map(trim(...), explode('|', $line)), explode("\n", trim($output)) ); } @@ -193,7 +196,8 @@ class Ipmitool * @param string|null $ipmi_type * @return ProcessResult */ - private function runCommand(array $commands, ?string $ipmi_type = null): ProcessResult { + private function runCommand(array $commands, ?string $ipmi_type = null): ProcessResult + { $cmd = $this->createCommand($commands, $ipmi_type); Log::debug('IPMI[%m' . implode(' ', $cmd) . '%n]', ['color' => true]); diff --git a/LibreNMS/Exceptions/IpmiConnectionFailed.php b/LibreNMS/Exceptions/IpmiConnectionFailed.php index adcc947c215ddf8d4865e8f9b4d874aaac61f797..85f25c18028ec0a6005820f6e72d523def50abe9 100644 --- a/LibreNMS/Exceptions/IpmiConnectionFailed.php +++ b/LibreNMS/Exceptions/IpmiConnectionFailed.php @@ -1,4 +1,5 @@ sensors()->where('poller_type', 'ipmi') ->get()->groupBy('sensor_class')->map->keyBy('sensor_descr'); if ($ipmiSensors->isEmpty()) {