<?php
-// $Id$
-
// Require login
require_once 'plc_login.php';
');
-ini_set("memory_limit","64M");
-
-// --------------------
+// --------------------
// recognized URL arguments
-$peerscope=$_GET['peerscope'];
-$pattern=$_GET['pattern'];
-$site_id=intval($_GET['site_id']);
-$slice_id=intval($_GET['slice_id']);
-$person_id=intval($_GET['person_id']);
+$peerscope = get_array($_GET, 'peerscope');
+$pattern = get_array($_GET, 'pattern');
+$site_id = intval(get_array($_GET, 'site_id'));
+$slice_id = intval(get_array($_GET, 'slice_id'));
+$person_id = intval(get_array($_GET, 'person_id'));
// --- decoration
$title="Nodes";
}
$tabs []= tab_nodes_local();
-// --------------------
+// --------------------
$node_filter=array();
//////////////////
// performs sanity check and summarize the result in a single column
function node_status ($node) {
- $messages=array();
- if ($node['node_type'] != 'regular' && $node['node_type'] != 'reservable' )
- $messages []= $node['node_type'];
-
- // checks on local nodes only
- if ( ( ! $node['peer_id']) ) {
- // has it got interfaces
- if (count($node['interface_ids']) == 0)
- $messages []= "No interface";
- }
- return plc_vertical_table($messages,'plc-warning');
+ $messages=array();
+ if ($node['node_type'] != 'regular' && $node['node_type'] != 'reservable' )
+ $messages []= $node['node_type'];
+
+ // checks on local nodes only
+ if ( ( ! $node['peer_id']) ) {
+ // has it got interfaces
+ if (count($node['interface_ids']) == 0)
+ $messages []= "No interface";
+ }
+ return plc_vertical_table($messages,'plc-warning');
}
-$first_time_configuration = false;
-
-if (plc_is_admin())
- $default_configuration = "ID:f|hostname:f|ST:f|AU:f";
-else
- $default_configuration = "hostname:f|ST:f|AU:f";
+if (plc_is_admin()) {
+ $default_configuration = "ID:f|hostname:f|ST:f|AU:f|RES:f";
+} else {
+ $default_configuration = "hostname:f|ST:f|AU:f|RES:f";
+}
//$extra_default = "LCN|DN|R|L|OS|MS|SN";
$column_configuration = "";
$slice_column_configuration = "";
$show_configuration = "";
-$show_columns_message = '1';
+$conf_tag_id = "";
+$show_tag_id = "";
$PersonTags=$api->GetPersonTags (array('person_id'=>$plc->person['person_id']));
//print_r($PersonTags);
foreach ($PersonTags as $ptag) {
- if ($ptag['tagname'] == 'columnconf')
- {
- $column_configuration = $ptag['value'];
- $conf_tag_id = $ptag['person_tag_id'];
- }
- if ($ptag['tagname'] == 'showconf')
- {
- $show_configuration = $ptag['value'];
- $show_tag_id = $ptag['person_tag_id'];
- }
+ if ($ptag['tagname'] == 'columnconf') {
+ $column_configuration = $ptag['value'];
+ $conf_tag_id = $ptag['person_tag_id'];
+ }
+ if ($ptag['tagname'] == 'showconf') {
+ $show_configuration = $ptag['value'];
+ $show_tag_id = $ptag['person_tag_id'];
+ }
}
//print("column configuration = ".$column_configuration);
$nodesconf_exists = false;
-if ($column_configuration == "")
-{
- $first_time_configuration = true;
- $column_configuration = "nodes;default";
- $nodesconf_exists = true;
-}
-else {
- $slice_conf = explode(";",$column_configuration);
- for ($i=0; $i<count($slice_conf); $i++ ) {
- if ($slice_conf[$i] == "nodes")
- {
- $i++;
- $slice_column_configuration = $slice_conf[$i];
- $nodesconf_exists = true;
- break;
- }
- else
- {
- $i++;
- $slice_column_configuration = $slice_conf[$i];
- }
+if ($column_configuration == "") {
+ $column_configuration = "nodes;default";
+ $nodesconf_exists = true;
+} else {
+ $slice_conf = explode(";",$column_configuration);
+ for ($i=0; $i<count($slice_conf); $i++ ) {
+ if ($slice_conf[$i] == "nodes") {
+ $i++;
+ $slice_column_configuration = $slice_conf[$i];
+ $nodesconf_exists = true;
+ break;
+ } else {
+ $i++;
+ $slice_column_configuration = $slice_conf[$i];
}
+ }
}
if ($nodesconf_exists == false)
if ($slice_column_configuration == "" || $slice_column_configuration == "default")
- $full_configuration = $default_configuration;
-
+ $full_configuration = $default_configuration;
+
else
- $full_configuration = $default_configuration."|".$slice_column_configuration;
+ $full_configuration = $default_configuration."|".$slice_column_configuration;
//print("full configuration = ".$full_configuration);
-// fetch nodes
+// fetch nodes
$node_fixed_columns=array('node_type','site_id','boot_state','last_contact','interface_ids','peer_id', 'slice_ids');
$fix_columns = array();
-if (plc_is_admin())
-$fix_columns[]=array('tagname'=>'node_id', 'header'=>'ID', 'type'=>'string', 'title'=>'The ID the node');
+if (plc_is_admin())
+ $fix_columns[]=array('tagname'=>'node_id', 'header'=>'ID', 'type'=>'string', 'title'=>'The ID the node');
$fix_columns[]=array('tagname'=>'hostname', 'header'=>'hostname', 'type'=>'string', 'title'=>'The name of the node');
$fix_columns[]=array('tagname'=>'peer_id', 'header'=>'AU', 'type'=>'string', 'title'=>'Authority');
$fix_columns[]=array('tagname'=>'run_level', 'header'=>'ST', 'type'=>'string', 'title'=>'Status');
-//$fix_columns[]=array('tagname'=>'node_type', 'header'=>'RES', 'type'=>'string', 'title'=>'Reservable');
+$fix_columns[]=array('tagname'=>'node_type', 'header'=>'RES', 'type'=>'string', 'title'=>'Reservable');
$visibletags = new VisibleTags ($api, 'node');
$visibletags->columns();
$tag_columns = $visibletags->headers();
+//columns that are not defined as extra myslice tags
$extra_columns = array();
+//MyPLC columns
$extra_columns[]=array('tagname'=>'sitename', 'header'=>'SN', 'type'=>'string', 'title'=>'Site name', 'fetched'=>true, 'source'=>'myplc');
$extra_columns[]=array('tagname'=>'domain', 'header'=>'DN', 'type'=>'string', 'title'=>'Toplevel domain name', 'fetched'=>true, 'source'=>'myplc');
$extra_columns[]=array('tagname'=>'ipaddress', 'header'=>'IP', 'type'=>'string', 'title'=>'IP Address', 'fetched'=>true, 'source'=>'myplc');
$extra_columns[]=array('tagname'=>'fcdistro', 'header'=>'OS', 'type'=>'string', 'title'=>'Operating system', 'fetched'=>false, 'source'=>'myplc');
-$extra_columns[]=array('tagname'=>'uptime', 'header'=>'UT', 'source'=>'comon', 'type'=>'sortAlphaNumericTop', 'title'=>'Continuous uptime until now', 'fetched'=>false);
$extra_columns[]=array('tagname'=>'date_created', 'header'=>'DA', 'source'=>'myplc', 'type'=>'date', 'title'=>'Date added', 'fetched'=>false);
+$extra_columns[]=array('tagname'=>'arch', 'header'=>'A', 'source'=>'myplc', 'type'=>'string', 'title'=>'Architecture', 'fetched'=>false);
+if (plc_is_admin()) {
+$extra_columns[]=array('tagname'=>'deployment', 'header'=>'DL', 'source'=>'myplc', 'type'=>'string', 'title'=>'Deployment', 'fetched'=>false);
+}
+
+//CoMon Live data
+//NOTE: Uncomment these lines if CoMon provides information for your nodes
+
+if (MYSLICE_COMON_AVAILABLE)
+{
+$extra_columns[]=array('tagname'=>'bwlimit', 'header'=>'BW', 'source'=>'comon', 'type'=>'sortAlphaNumericTop', 'title'=>'Bandwidth limit', 'fetched'=>false);
+$extra_columns[]=array('tagname'=>'numcores', 'header'=>'CC', 'source'=>'comon', 'type'=>'sortAlphaNumericTop', 'title'=>'Number of CPU Cores', 'fetched'=>false);
+$extra_columns[]=array('tagname'=>'cpuspeed', 'header'=>'CR', 'source'=>'comon', 'type'=>'sortAlphaNumericTop', 'title'=>'CPU clock rate', 'fetched'=>false);
+$extra_columns[]=array('tagname'=>'disksize', 'header'=>'DS', 'source'=>'comon', 'type'=>'sortAlphaNumericTop', 'title'=>'Disk size', 'fetched'=>false);
+$extra_columns[]=array('tagname'=>'gbfree', 'header'=>'DF', 'source'=>'comon', 'type'=>'sortAlphaNumericTop', 'title'=>'Currently available disk space', 'fetched'=>false);
+$extra_columns[]=array('tagname'=>'memsize', 'header'=>'MS', 'source'=>'comon', 'type'=>'sortAlphaNumericTop', 'title'=>'Memory size', 'fetched'=>false);
+$extra_columns[]=array('tagname'=>'numslices', 'header'=>'SM', 'source'=>'comon', 'type'=>'sortAlphaNumericTop', 'title'=>'Number of slices in memory', 'fetched'=>false);
+$extra_columns[]=array('tagname'=>'uptime', 'header'=>'UT', 'source'=>'comon', 'type'=>'sortAlphaNumericTop', 'title'=>'Continuous uptime until now', 'fetched'=>false);
+}
+
+//TopHat Live data
+
+if (MYSLICE_TOPHAT_AVAILABLE)
+{
+$extra_columns[]=array('tagname'=>'asn', 'header'=>'AS', 'source'=>'tophat', 'type'=>'string', 'title'=>'AS Number', 'fetched'=>false);
+$extra_columns[]=array('tagname'=>'city', 'header'=>'LCY', 'source'=>'tophat', 'type'=>'string', 'title'=>'City', 'fetched'=>false);
+$extra_columns[]=array('tagname'=>'region', 'header'=>'LRN', 'source'=>'tophat', 'type'=>'string', 'title'=>'Region', 'fetched'=>false);
+$extra_columns[]=array('tagname'=>'country', 'header'=>'LCN', 'source'=>'tophat', 'type'=>'string', 'title'=>'Country', 'fetched'=>false);
+$extra_columns[]=array('tagname'=>'continent', 'header'=>'LCT', 'source'=>'tophat', 'type'=>'string', 'title'=>'Continent', 'fetched'=>false);
//$extra_columns[]=array('tagname'=>'hopcount', 'header'=>'HC', 'source'=>'tophat', 'type'=>'sortAlphaNumericTop', 'title'=>'Hop count from reference node', 'fetched'=>false);
+////$extra_columns[]=array('tagname'=>'rtt', 'header'=>'RTT', 'source'=>'tophat', 'type'=>'sortAlphaNumericTop', 'title'=>'Round trip time from reference node', 'fetched'=>false);
+////$extra_columns[]=array('tagname'=>'agents', 'header'=>'MA', 'source'=>'tophat', 'type'=>'sortAlphaNumericTop', 'title'=>'Co-located measurement agents', 'fetched'=>true);
+////$extra_columns[]=array('tagname'=>'agents_sonoma', 'header'=>'MAS', 'source'=>'tophat', 'type'=>'sortAlphaNumericTop', 'title'=>'Co-located SONoMA agents', 'fetched'=>true);
+////$extra_columns[]=array('tagname'=>'agents_etomic', 'header'=>'MAE', 'source'=>'tophat', 'type'=>'sortAlphaNumericTop', 'title'=>'Co-located ETOMIC agents', 'fetched'=>true);
+////$extra_columns[]=array('tagname'=>'agents_tdmi', 'header'=>'MAT', 'source'=>'tophat', 'type'=>'sortAlphaNumericTop', 'title'=>'Co-located TDMI agents', 'fetched'=>true);
+////$extra_columns[]=array('tagname'=>'agents_dimes', 'header'=>'MAD', 'source'=>'tophat', 'type'=>'sortAlphaNumericTop', 'title'=>'Co-located DIMES agents', 'fetched'=>true);
+}
$ConfigureColumns =new PlekitColumns($full_configuration, $fix_columns, $tag_columns, $extra_columns);
}
// server-side selection on peerscope
-$peerscope=new PeerScope($api,$_GET['peerscope']);
+$peerscope=new PeerScope($api,get_array($_GET, 'peerscope'));
$node_filter=array_merge($node_filter,$peerscope->filter());
$title .= ' - ' . $peerscope->label();
if ($person_id) {
// avoid doing a useless call to GetPersons if the person_id is already known though $plc,
// as this is mostly done for the 'all my sites nodes' link
- if ($person_id == plc_my_person_id()) {
+ if ($person_id == plc_my_person_id()) {
$person=plc_my_person();
$site_ids = plc_my_site_ids();
} else {
$ConfigureColumns->fetch_live_data($nodes);
+$show_columns_message = TRUE;
$show_conf = explode(";",$show_configuration);
foreach ($show_conf as $ss) {
- if ($ss =="columns")
- $show_columns_message = '0';
+ if ($ss =="columns")
+ $show_columns_message = FALSE;
}
drupal_set_message ('No node found');
return;
}
-
+
$nifty=new PlekitNifty ('','objects-list','big');
$nifty->start();
-$headers = array (); $offset=0;
+$headers = array ();
$notes=array();
$notes [] = "For information about the different columns please see the <b>node table layout</b> tab above or <b>mouse over</b> the column headers";
-
-/*
-// fixed columns
-if (plc_is_admin()) {
- $short="I"; $long="node_id"; $type='int';
- $headers[$short]=array('type'=>$type,'title'=>$long); $notes []= "$short = $long";
- $offset=1;
- }
-$short="P"; $long="Peer"; $type='string';
- $headers[$short]=array('type'=>$type,'title'=>$long); $notes []= "$short = $long";
-$short="D"; $long="toplevel domain name"; $type='string';
- $headers[$short]=array('type'=>$type,'title'=>$long); $notes []= "$short = $long";
-$headers["Site"]="string";
-$headers["Hostname"]="string";
-$short="IP"; $long="IP Address"; $type='sortIPAddress';
- $headers[$short]=array('type'=>$type,'title'=>$long); $notes []= "$short = $long";
-$short="ST"; $long=Node::status_footnote(); $type='string';
- $headers[$short]=array('type'=>$type,'title'=>$long); $notes []= "$short = $long";
-$short="SL"; $long="Number of slivers"; $type='int';
- $headers[$short]=array('type'=>$type,'title'=>$long); $notes []= "$short = $long";
-
-$headers=array_merge($headers,$visibletags->headers());
-$notes=array_merge($notes,$visibletags->notes());
-$short="?"; $long="extra status info"; $type='string';
- $headers[$short]=array('type'=>$type,'title'=>$long); $notes []= "$short = $long";
-*/
-
$info_header = array();
-$short="?"; $long="extra status info"; $type='string';
-$info_header[$short]=array('type'=>$type,'title'=>$long, 'label'=>'?', 'header'=>'?', 'visible'=>true);
+$short="?"; $long="extra status info"; $type='string';
+$info_header[$short]=array('type'=>$type,'title'=>$long, 'label'=>'?', 'header'=>'?', 'visible'=>true);
//$notes []= "$short = $long";
//$info_header["?"] = "none";
$headers = array_merge($ConfigureColumns->get_headers(),$info_header);
-if ($first_time_configuration)
-$column_conf_visible = '1';
-else
-$column_conf_visible = '0';
-
-$toggle_nodes=new PlekitToggle('nodes-column-configuration',
+$layout_help='
+This tab allows you to customize the columns in the node tables,
+below. Information on the nodes comes from a variety of monitoring
+sources. If you, as either a user or a provider of monitoring data,
+would like to see additional columns made available, please send us
+your request in mail to <a
+href="mailto:support@myslice.info">support@myslice.info</a>. You can
+find more information about the MySlice project at <a
+href="http://trac.myslice.info">http://trac.myslice.info</a>.
+';
+$toggle_nodes=new PlekitToggle('nodes-layout',
"Node table layout",
- array('visible'=>$column_conf_visible, 'info_div'=>'note_columns_div'));
+ array('visible'=>NULL,
+ 'info-text'=>$layout_help,
+ 'info-visible'=>$show_columns_message));
$toggle_nodes->start();
print("<div id='debug'></div>");
print("<input type='hidden' id='slice_id' value='nodes' />");
print("<br><input type='hidden' size=80 id='full_column_configuration' value='".$column_configuration."' />");
print("<input type='hidden' id='defaultConf' value='".$default_configuration."'></input>");
-if ($show_columns_message == '0')
-$note_display = "display:none;";
-else
-$note_display = "";
-
-
-print <<<EOF
-<div id='note_columns_div' style="align:center; background-color:#CAE8EA; padding:4px; width:800px; $note_display">
-<table align=center><tr><td valign=top>
-This tab allows you to customize the columns in the node tables, below. Information on the nodes comes from a variety of monitoring sources. If you, as either a user or a provider of monitoring data, would like to see additional columns made available, please send us your request in mail to <a href="mailto:support@myslice.info">support@myslice.info</a>. You can find more information about the MySlice project at <a href="http://trac.myslice.info">http://trac.myslice.info</a>.
-</td><td valign=top><span onClick=closeMessage('columns')><img class='reset' src="/planetlab/icons/clear.png" alt="hide message permanently"></span>
-</td></tr></table>
-</div>
-EOF;
+////////// end
$ConfigureColumns->configuration_panel_html(true);
$ConfigureColumns->javascript_init();
'configurable'=>true);
# initial sort on hostnames
-$table=new PlekitTable ("nodes",$headers,3+$offset, $table_options);
+$table=new PlekitTable ("nodes",$headers,2, $table_options);
$table->start();
$peers = new Peers ($api);
// write rows
foreach ($nodes as $node) {
//$node_obj = new Node ($node);
+
$hostname=$node['hostname'];
$node_id=$node['node_id'];
$site_id=$node['site_id'];
$ip=$interface_hash[$node['node_id']]['ip'];
$interface_id=$interface_hash[$node['node_id']]['interface_id'];
$peer_id=$node['peer_id'];
-
+
$table->row_start();
$table->cell($node['node_id'], array('display'=>'none'));
if (plc_is_admin()) $table->cell(l_node_t($node_id,$node_id));
list($label,$class) = Node::status_label_class_($node);
$table->cell ($label,array('class'=>$class));
+ $table->cell( ($node['node_type']=='reservable')?reservable_mark():"" );
//$table->cell (count($node['slice_ids']));
//foreach ($visiblecolumns as $tagname) $table->cell($node[$tagname]);
$ConfigureColumns->cells($table, $node);
$table->cell (node_status($node));
$table->row_end();
-
+
}
$table->end();
$nifty->end();
+
//plekit_linetabs ($tabs,"bottom");
// Print footer
git://git.onelab.eu / plewww.git / blobdiff