diff --git a/xCAT-UI/monitor/monlist.php b/xCAT-UI/monitor/monlist.php index cf7695ad4..5906fa196 100644 --- a/xCAT-UI/monitor/monlist.php +++ b/xCAT-UI/monitor/monlist.php @@ -3,7 +3,7 @@ if(!isset($TOPDIR)) { $TOPDIR="/opt/xcat/ui";} require_once "$TOPDIR/lib/security.php"; require_once "$TOPDIR/lib/functions.php"; require_once "$TOPDIR/lib/display.php"; - + #displayMonitorLists() will generate all the monitoring plug-ins, #the user can select the plug-ins he wants to operate on, #and press the "Next" button; @@ -15,55 +15,66 @@ if(!isset($TOPDIR)) { $TOPDIR="/opt/xcat/ui";} exit; } #then, parse the xml data + $ooe = 0; + $line = 0; foreach($xml->children() as $response) foreach($response->children() as $data) { - list($name, $stat) = preg_split("/\s+/", $data); - echo << - $name - $stat - - -TAB1; + list($name, $stat, $nodemonstatus) = preg_split("/\s+/", $data); + $ooe = $ooe%2; + echo ""; + echo ""; + echo "$name"; + echo "$stat"; + if(isset($nodemonstatus)) { echo "Yes";}else {echo "No";} + echo " "; + $ooe++; + $line++; //echo "$name$stat$name"; } return 0; } ?> -
+
-

Tips:

-

Please select the available plug-ins, and click the "next" button for next steps;

+
    +

    Tips:

    +
  • Click the name of each plugin, you can get the plugin's description.
  • +
  • You can also select one plugin, then you can set node/application status monitoring for the selected plugin
  • +
-
- - - - - - +
+
Plug-in NameStatusNode Status Monitoring
+ + + + + + - +
Plug-in NameStatusNode Status Monitoring
+
-
- -'NEXT', 'id'=>'next', 'onclick'=>'loadMainPage("main.php")')); ?> - +
+
'Next', 'id'=> 'next', 'onclick' => 'loadMainPage("monitor/stat_mon.php")'))?>
diff --git a/xCAT-UI/monitor/plugin_desc.php b/xCAT-UI/monitor/plugin_desc.php index f0c013724..5bcbd360f 100644 --- a/xCAT-UI/monitor/plugin_desc.php +++ b/xCAT-UI/monitor/plugin_desc.php @@ -21,8 +21,8 @@ if (getXmlErrors($xml, $errors)) { $information = ""; foreach ($xml->children() as $response) foreach ($response->children() as $data) { - $information .= $data; - $information .= "\n"; + $information .= str_replace("\n", "
", $data);; + $information .= "\n
"; //print_r($data); } echo $information; diff --git a/xCAT-UI/monitor/stat_mon.php b/xCAT-UI/monitor/stat_mon.php new file mode 100644 index 000000000..1f469e7f8 --- /dev/null +++ b/xCAT-UI/monitor/stat_mon.php @@ -0,0 +1,7 @@ +This page is under development.

"; +?>