Commit 5fc730ef authored by Till Brehm's avatar Till Brehm
Browse files

Fixed: FS#3183 - Fix & Improve RAID Monitoring for tw_cli (3Ware)

parent d796e4ba
...@@ -377,7 +377,9 @@ class tools_monitor { ...@@ -377,7 +377,9 @@ class tools_monitor {
} }
else { else {
$data = unserialize($record['data']); $data = unserialize($record['data']);
$html .= nl2br($data['output']); // improve view @Author <info@typoworx.de>
//-- $html .= nl2br($data['output']);
$html .= '<xmp>' . $data['output'] . '</xmp>';
} }
$html .= '</div></div>'; $html .= '</div></div>';
......
...@@ -1149,10 +1149,13 @@ class monitor_tools { ...@@ -1149,10 +1149,13 @@ class monitor_tools {
/* /*
* 3ware Controller * 3ware Controller
*/ */
system('which tw_cli', $retval); system('which tw_cli', $retval);
if($retval === 0) { if($retval === 0) {
$data['output'] = shell_exec('tw_cli info c0'); // TYPOWORX FIX | Determine Controler-ID
$availableControlers = shell_exec('tw_cli info | grep -Eo "c[0-9]+');
$data['output'] = shell_exec('tw_cli info ' . $availableControlers);
$state = 'ok'; $state = 'ok';
if(is_array($data['output'])) { if(is_array($data['output'])) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment