",implode(' ',$errors), "
"; + $xml = docmd("monls", "", array('-a')); + if(getXmlErrors($xml, $errors)) { + echo "", implode(' ', $errors), "
"; exit; } - #then, parse the xml data - foreach($xml->children() as $response) foreach($response->children() as $data) { - list($n, $stat, $nodemonstatus) = preg_split("/\s+/",$data); - if(isset($nodemonstatus)) { - $ns = "Enabled"; - }else { - $ns = "Disabled"; - } + + foreach($xml->children() as $response) foreach ($response->children() as $data) { + list($name, $stat, $nodemon) = preg_split("/\s+/", $data); + //create .pluginstat class for each plugin + echo "",implode(' ', $errors), "
"; - exit; - } -} - -echo "successful"; -?> diff --git a/xCAT-UI/monitor/monlist.php b/xCAT-UI/monitor/monlist.php index 8247318a8..432f6c506 100644 --- a/xCAT-UI/monitor/monlist.php +++ b/xCAT-UI/monitor/monlist.php @@ -1,22 +1,83 @@ 'main.php', 'monitor' =>'')); +displayMapper(array('home'=>'main.php', 'new_monitor' =>'')); -displayTips(array("Click the name of each plugin, you can get the plugin's description.", - "Select one plugin, choose the options for set up monitoring ", - "Click the button \"Start\", \"Stop\" or \"Restart\" to setup monitoring plugin")); +?> + -?> \ No newline at end of file +All the options for configuration are here.
+//choose the options to update them
+// +// +//TOS11; + echo "Press the following buttons to enable/disable the settings
+In order to make it effect, turn to the "Enable/Disable" tab for the plugin
+monls failed: ", implode(' ',$errors), "
\n"; + exit; + } + + + $information = ""; + foreach ($xml->children() as $response) foreach ($response->children() as $data) { + $information .="$data
"; + } + echo $information; +} + +/* + * changePluginStat($name) + * which is used to enable/disable the selected plugin, + * and which return whether they're sucessful or not + */ +function showPluginStat($name, $opt) +{ + //display the nrtree here + //let the user choose node/noderange to enable/disable monitor plugin + echo "The $name Plugin is in Disabled status
"; + echo "You can Press the Following button to change its status
"; + echo "Select the noderange from the right tree
"; + echo "OR: you can type the noderange in the following area
"; + echo "When you are trying to enable the plugin
would you like to support node status monitoring?
"; + insertRadioBtn(); + insertButtonSet("Enable","Disable", 0); + }else if($opt == 'disable') { + //monstop + //mondecfg + echo "The $name Plugin is in Enabled status
"; + echo "You can Press the Following button to change its status
"; + echo "Select the noderange from the right tree
"; + echo "OR: you can type the noderange in the following area
"; + echo "When you are trying to enable the plugin
would you like to support node status monitoring?
"; + insertRadioBtn(); + insertButtonSet("Enable","Disable", 1); + } + echo ""; +} + +function insertRadioBtn() +{ + //to provide the choose to support "-n"(node status monitoring) +echo <<"; -echo $information; -echo "
"; -?> - diff --git a/xCAT-UI/monitor/setup.php b/xCAT-UI/monitor/setup.php index 0702d1e71..7a5391e85 100644 --- a/xCAT-UI/monitor/setup.php +++ b/xCAT-UI/monitor/setup.php @@ -2,7 +2,7 @@ /* * setup.php - * perform the "monstart", "monadd" and "monstop" actions for selected monitoring plugins + * to perform the "monstart" and "monstop" actions for the monitoring plugins */ if(!isset($TOPDIR)) { $TOPDIR="..";} @@ -14,82 +14,119 @@ require_once "$TOPDIR/lib/monitor_display.php"; $name = $_REQUEST['name']; $action = $_REQUEST['action']; -//read the "monitoring" table to see whether node status monitoring is enable or not -//$xml = docmd("webrun", "", array("gettab name=$name monitoring.nodestatmon")); -//if(getXmlErrors($xml, $errors)) { -// echo "",implode(' ', $errors), "
"; -// exit; -//} -// -//foreach($xml->children() as $response) foreach($response->children() as $data) -//{ -// $nodemonstat = $data; -//} -switch($action) { - case "stop": - monstop($name); - break; - case "restart": - monrestart($name); - break; - case "start": - monstart($name); - break; - default: - break; -} +$nm = $_REQUEST['nm'];//node status monitoring: yes or no +$noderange = $_REQUEST['nr']; -function monstop($plugin) -{ - $xml = docmd("monstop", "", array("$plugin","-r")); - return 0; -} - -function monrestart($plugin) -{ - $xml = docmd("monstop", "", array("$plugin", "-r")); +if($action == "Disable") { + //FIXIT: it seems rmcmon has sth wrong with monstop + //The var $noderange can't work + $xml = docmd("monstop", " ", array("$name", "$noderange" , "-r")); if(getXmlErrors($xml, $errors)) { echo "",implode(' ', $errors), "
"; exit; } - $xml = docmd("moncfg", "", array("$plugin", "-r")); + $xml = docmd("mondecfg", " ", array("$name", "$noderange")); if(getXmlErrors($xml, $errors)) { - echo "",implode(' ', $errors), "
"; + echo "", implode(' ', $errors), "
"; exit; } - - $xml = docmd("monstart", "", array("$plugin", "-r")); - return 0; -} - -function monstart($plugin) -{ - //Before running "monstart", the command "monls" is used to check - $xml = docmd("monls","", NULL); + echo "successful"; +}else if($action == "Enable") { + //at first, check "-n" + if($nm == "yes") { + $xml=docmd("monrm", "", array("$name")); + $xml = docmd("monadd", "", array("$name", "-n")); + } else if($nm == "no") { + $xml = docmd("monrm", "", array("$name")); + $xml = docmd("monadd", "", array("$name")); + } + //then, moncfg + $xml = docmd("moncfg", " ", array("$name", "$noderange")); if(getXmlErrors($xml, $errors)) { - echo "",implode(' ', $errors), "
"; + echo "", implode(' ', $errors), "
"; exit; } - $has_plugin = false; - if(count($xml->children()) != 0) { - foreach($xml->children() as $response) foreach($response->children() as $data) { - $arr = preg_split("/\s+/", $data); - if($arr[0] == $plugin) { - $has_plugin = true; - } - } - } - if($has_plugin == false) { - //if $has_plugin == false, that means the plugin is not added into the monitoring table - $xml = docmd("monadd",'', array("$plugin")); + //special case for rmcmon + if($name == "rmcmon") { + $xml = docmd("moncfg", " ", array("$name", "$noderange", "-r")); if(getXmlErrors($xml, $errors)) { - echo "",implode(' ', $errors), "
"; + echo "", implode(' ', $errors), "
"; exit; } } - //we have to make sure that the plugin is added in the "monitoring" table - $xml = docmd("monstart", "", array("$plugin", "-r")); - return 0; + $xml = docmd("monstart", " ", array("$name", "$noderange", "-r")); + if(getXmlErrors($xml, $errors)) { + echo "", implode(' ', $errors), "
"; + exit; + } + echo "successful"; } -?> +//switch($action) { +// case "stop": +// monstop($name); +// break; +// case "restart": +// monrestart($name); +// break; +// case "start": +// monstart($name); +// break; +// default: +// break; +//} +// +//function monstop($plugin) +//{ +// $xml = docmd("monstop", "", array("$plugin","-r")); +// return 0; +//} +// +//function monrestart($plugin) +//{ +// $xml = docmd("monstop", "", array("$plugin", "-r")); +// if(getXmlErrors($xml, $errors)) { +// echo "",implode(' ', $errors), "
"; +// exit; +// } +// $xml = docmd("moncfg", "", array("$plugin", "-r")); +// if(getXmlErrors($xml, $errors)) { +// echo "",implode(' ', $errors), "
"; +// exit; +// } +// +// $xml = docmd("monstart", "", array("$plugin", "-r")); +// return 0; +//} +// +//function monstart($plugin) +//{ +// //Before running "monstart", the command "monls" is used to check +// $xml = docmd("monls","", NULL); +// if(getXmlErrors($xml, $errors)) { +// echo "",implode(' ', $errors), "
"; +// exit; +// } +// $has_plugin = false; +// if(count($xml->children()) != 0) { +// foreach($xml->children() as $response) foreach($response->children() as $data) { +// $arr = preg_split("/\s+/", $data); +// if($arr[0] == $plugin) { +// $has_plugin = true; +// } +// } +// } +// if($has_plugin == false) { +// //if $has_plugin == false, that means the plugin is not added into the monitoring table +// $xml = docmd("monadd",'', array("$plugin")); +// if(getXmlErrors($xml, $errors)) { +// echo "",implode(' ', $errors), "
"; +// exit; +// } +// } +// //we have to make sure that the plugin is added in the "monitoring" table +// $xml = docmd("monstart", "", array("$plugin", "-r")); +// return 0; +//} +// +//?> diff --git a/xCAT-UI/monitor/stat_mon.php b/xCAT-UI/monitor/stat_mon.php deleted file mode 100644 index 01c5c033e..000000000 --- a/xCAT-UI/monitor/stat_mon.php +++ /dev/null @@ -1,20 +0,0 @@ -