// -------------------- admins potentially need to get full list of users
ini_set('memory_limit','32M');
+//error_reporting(0);
$profiling=false;
if ($_GET['profiling']) $profiling=true;
$extra_columns[]=array('tagname'=>'uptime', 'header'=>'UT', 'source'=>'comon', 'type'=>'sortAlphaNumericTop', 'title'=>'Continuous uptime until now', 'fetched'=>false);
//TopHat Live data
+$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);
+//
+//
//Get user's column configuration
$show_reservable_message = '1';
$show_columns_message = '1';
-
-//$PersonTags=$api->GetPersonTags (array('person_id'=>$plc->person['person_id']));
$PersonTags=$api->GetPersonTags (array('person_id'=>$plc->person['person_id']));
-//print_r($PersonTags);
+//plc_debug('ptags',$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'];
+ } else if ($ptag['tagname'] == 'showconf') {
+ $show_configuration = $ptag['value'];
+ $show_tag_id = $ptag['person_tag_id'];
+ }
}
-//print("<br>person column configuration = ".$column_configuration);
-//print("<br>person show configuration = ".$show_configuration);
-
$sliceconf_exists = false;
-if ($column_configuration == "")
-{
- $first_time_configuration = true;
- $column_configuration = $slice_id.";default";
- $sliceconf_exists = true;
-}
-else {
- $slice_conf = explode(";",$column_configuration);
- for ($i=0; $i<count($slice_conf); $i++ ) {
- if ($slice_conf[$i] == $slice_id)
- {
- $i++;
- $slice_column_configuration = $slice_conf[$i];
- $sliceconf_exists = true;
- break;
- }
- else
- {
- $i++;
- $slice_column_configuration = $slice_conf[$i];
- }
- }
+if ($column_configuration == "") {
+ $first_time_configuration = true;
+ $column_configuration = $slice_id.";default";
+ $sliceconf_exists = true;
+} else {
+ $slice_conf = explode(";",$column_configuration);
+ for ($i=0; $i<count($slice_conf); $i++ ) {
+ if ($slice_conf[$i] == $slice_id) {
+ $i++;
+ $slice_column_configuration = $slice_conf[$i];
+ $sliceconf_exists = true;
+ break;
+ } else {
+ $i++;
+ $slice_column_configuration = $slice_conf[$i];
+ }
+ }
}
if ($sliceconf_exists == false)
- $column_configuration = $column_configuration.";".$slice_id.";default";
-
-//print("<br>slice configuration = ".$slice_column_configuration);
-
+ $column_configuration = $column_configuration.";".$slice_id.";default";
if ($slice_column_configuration == "")
- $full_configuration = $default_configuration;
+ $full_configuration = $default_configuration;
else
- $full_configuration = $default_configuration."|".$slice_column_configuration;
+ $full_configuration = $default_configuration."|".$slice_column_configuration;
//instantiate the column configuration class, which prepares the headers array
$visiblecolumns = $ConfigureColumns->node_tags();
$node_columns=array_merge($node_fixed_columns,$visiblecolumns);
-//print_r($node_columns);
$all_nodes=$api->GetNodes(NULL,$node_columns);
$ConfigureColumns->fetch_live_data($all_nodes);
-//print("<br>person show configuration = ".$show_configuration);
-
$show_conf = explode(";",$show_configuration);
foreach ($show_conf as $ss) {
- if ($ss =="reservable")
- $show_reservable_message = '0';
- if ($ss =="columns")
- $show_columns_message = '0';
+ if ($ss =="reservable")
+ $show_reservable_message = '0';
+ else if ($ss =="columns")
+ $show_columns_message = '0';
}
-//print("res:".$show_reservable_message." - cols:".$show_columns_message);
-
$slice_nodes=array();
$potential_nodes=array();
$reservable_nodes=array();
// having reservable nodes in white lists looks a bit off scope for now...
$toggle_nodes=new PlekitToggle('my-slice-nodes-reserve',
"Leases - " . count($reservable_nodes) . " reservable node(s)",
- array('visible'=>$show_reservable_message, 'info_div'=>'note_reservable_div'));
+ array('visible'=>get_arg('show_nodes_resa',false), 'info_div'=>'note_reservable_div'));
$toggle_nodes->start();
if ($show_reservable_message)
-$note_display = "";
+ $note_display = "";
else
-$note_display = "display:none;";
+ $note_display = "display:none;";
////////// show a notice to people having attached a reservable node
if (count($reservable_nodes) && $privileges) {
if ( ! $leases_offset ) $leases_offset=0;
// how many timeslots to show
$leases_slots=$_GET['leases_slots'];
- if ( ! $leases_slots ) $leases_slots = 36;
+ if ( ! $leases_slots ) $leases_slots = 48;
// offset in hours (in the future) from now
$leases_w = $_GET['leases_w'];
- if ( ! $leases_w) $leases_w=20;
+ if ( ! $leases_w) $leases_w=14;
// number of timeslots to display
- $grain=$api->GetLeaseGranularity();
+ $granularity=$api->GetLeaseGranularity();
// these elements are for passing data to the javascript layer
echo "<span class='hidden' id='leases_slicename'>" . $slice['name'] . "</span>";
- echo "<span class='hidden' id='leases_sliceid'>" . $slice['slice_id']. "</span>";
- echo "<span class='hidden' id='leases_grain'>" . $grain . "</span>";
- echo "<span class='hidden' id='leases_offset'>" . $leases_offset . "</span>";
- echo "<span class='hidden' id='leases_slots'>" . $leases_slots . "</span>";
- echo "<span class='hidden' id='leases_w'>" . $leases_w . "</span>";
-
- // cut off
- if ($profiling) plc_debug_prof('6 granul',$grain);
- // where to start from, expressed as an offset in hours from now
- $rough_start=time()+$leases_offset*3600;
- // show the next 36 grains
- $duration=$leases_slots*$grain;
- $steps=$duration/$grain;
- $start=intval($rough_start/$grain)*$grain;
- $end=$rough_start+$duration;
- $lease_columns=array('lease_id','name','t_from','t_until','hostname','name');
- $leases=$api->GetLeases(array(']t_until'=>$rough_start,'[t_from'=>$end,'-SORT'=>'t_from'),$lease_columns);
- if ($profiling) plc_debug_prof('7 leases',count($leases));
- // hash nodes -> leases
- $host_hash=array();
- foreach ($leases as $lease) {
- $hostname=$lease['hostname'];
- if ( ! $host_hash[$hostname] ) {
- $host_hash[$hostname]=array();
- }
- // resync within the table
- $lease['nfrom']=($lease['t_from']-$start)/$grain;
- $lease['nuntil']=($lease['t_until']-$start)/$grain;
- $host_hash[$hostname] []= $lease;
- }
- // leases_data is the name used by leases.js to locate this table
- echo "<table id='leases_data' class='hidden'>";
- // pass (slice_id,slicename,x_grain) in the upper-left cell, as thead>tr>td
- echo "<thead><tr><td>" . $slice['slice_id'] . '&' . $slice['name'] . '&' . $leases_w . "</td>";
- // the timeslot headers read (timestamp,label)
- $day_names=array('Su','M','Tu','W','Th','F','Sa');
- for ($i=0; $i<$steps; $i++) {
- $timestamp=($start+$i*$grain);
- $day=$day_names[intval(strftime("%w",$timestamp))];
- $label=$day . strftime(" %H:%M",$timestamp);
- // expose in each header cell the full timestamp, and how to display it - use & as a separator*/
- echo "<th>" . implode("&",array($timestamp,$label)) . "</th>";
- }
- echo "</tr></thead><tbody>";
- // todo - sort on hostnames
- function sort_hostname ($a,$b) { return ($a['hostname']<$b['hostname'])?-1:1;}
- usort($reservable_nodes,sort_hostname);
- foreach ($reservable_nodes as $node) {
- echo "<tr><th scope='row'>". $node['hostname'] . "</th>";
- $hostname=$node['hostname'];
- $leases=$host_hash[$hostname];
- $counter=0;
- while ($counter<$steps) {
- if ($leases && ($leases[0]['nfrom']<=$counter)) {
- $lease=array_shift($leases);
- /* nicer display, merge two consecutive leases for the same slice
- avoid doing that for now, as it might makes things confusing */
- /* while ($leases && ($leases[0]['name']==$lease['name']) && ($leases[0]['nfrom']==$lease['nuntil'])) {
- $lease['nuntil']=$leases[0]['nuntil'];
- array_shift($leases);
- }*/
- $duration=$lease['nuntil']-$counter;
- echo "<td colspan='$duration'>" . $lease['lease_id'] . '&' . $lease['name'] . "</td>";
- $counter=$lease['nuntil'];
- } else {
- echo "<td></td>";
- $counter+=1;
- }
- }
- echo "</tr>";
- }
- echo "</tbody></table>\n";
+ echo "<span class='hidden' id='leases_slice_id'>" . $slice['slice_id']. "</span>";
+ echo "<span class='hidden' id='leases_granularity'>" . $granularity . "</span>";
+ // ditto, and editable - very rough for now
+ echo "<div class='center' id='leases_settings'>";
+ echo "<label id='leases_offset_label' class='leases_label'>start, in hours from now</label>";
+ echo "<input type='text' class='leases_input' id='leases_offset_input' value='$leases_offset' />";
+ echo "<label id='leases_slots_label' class='leases_label'># of timeslots</label>";
+ echo "<input type='text' class='leases_input' id='leases_slots_input' value='$leases_slots' />";
+ echo "<label id='leases_w_label' class='leases_label'>slot width, in pixels</label>";
+ echo "<input type='text' class='leases_input' id='leases_w_input' value='$leases_w' />";
+ echo "</div>";
+
+ // leases_data is the name used by leases.js to locate this place
+ // first population will be triggered by init_scheduler from leases.js
+ echo "<table id='leases_data' class='hidden'></table>";
// the general layout for the scheduler
echo <<< EOF
//////////////////// node configuration panel
-
if ($first_time_configuration)
$column_conf_visible = '1';
else
//print ("showing column message = ".$show_columns_message);
if ($show_columns_message == '0')
-$note_display = "display:none;";
+ $note_display = "display:none;";
else
-$note_display = "";
+ $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>
+<div class='note-div' id='note_columns_div' style='$note_display'>
+<table class='center'><tr><td class='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><td
class='top'><span onClick=closeMessage('columns')><img class='reset' src="/planetlab/icons/clear.png" alt="hide message permanently"></span>
</td></tr></table>
</div>
EOF;
git://git.onelab.eu / plewww.git / blobdiff