X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetlab%2Fslices%2Fslice.php;h=62041aa330e2586fb77cf0f554fd990d73a10d17;hb=d694eb9fdfe0a7bcb9d8fc7b571751475f4227be;hp=3975fbb736b54c18e192aa9ce02d210b756f8996;hpb=bbdd2d949c4f1dc8db02dcc184d651f534a7b2a5;p=plewww.git diff --git a/planetlab/slices/slice.php b/planetlab/slices/slice.php index 3975fbb..62041aa 100644 --- a/planetlab/slices/slice.php +++ b/planetlab/slices/slice.php @@ -1,7 +1,5 @@ columns(); $tag_columns = $visibletags->headers(); +//columns that are not defined as extra myslice tags $extra_columns = array(); -$extra_columns[]=array('tagname'=>'sitename', 'header'=>'SN', 'type'=>'string', 'title'=>'Site name', 'fetched'=>true); -$extra_columns[]=array('tagname'=>'domain', 'header'=>'DN', 'type'=>'string', 'title'=>'Toplevel domain name', 'fetched'=>true); -$extra_columns[]=array('tagname'=>'ipaddress', 'header'=>'IP', 'type'=>'string', 'title'=>'IP Address', 'fetched'=>true); -$extra_columns[]=array('tagname'=>'fcdistro', 'header'=>'OS', 'type'=>'string', 'title'=>'Operating system', 'fetched'=>false); -$extra_columns[]=array('tagname'=>'uptime', 'header'=>'UT', 'source'=>'comon', 'type'=>'sortAlphaNumericTop', 'title'=>'Continuous uptime until now', 'fetched'=>false); +//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'=>'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 +$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 +$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 @@ -450,61 +479,45 @@ $show_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("
person column configuration = ".$column_configuration); -//print("
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; $islice 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 @@ -513,23 +526,18 @@ $ConfigureColumns =new PlekitColumns($full_configuration, $fix_columns, $tag_col $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("
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(); @@ -560,13 +568,13 @@ if ($count && $privileges) { // 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) { @@ -581,92 +589,51 @@ Your slivers will be available only during timeslots where you have obtained leases. You can manage your leases in the tab below.
-Please note that as of August 2010 this feature is experimental. -Feedback is appreciated at devel@planet-lab.org +This feature is still experimental; feedback is appreciated at devel@planet-lab.org hide message EOF; } - $grain=$api->GetLeaseGranularity(); - if ($profiling) plc_debug_prof('6 granul',$grain); - // where to start from, expressed as an offset in hours from now - $resa_offset=$_GET['resa_offset']; - if ( ! $resa_offset ) $resa_offset=0; - $rough_start=time()+$resa_offset*3600; - // xxx should be configurable - $resa_slots=$_GET['resa_slots']; - if ( ! $resa_slots ) $resa_slots = 36; - // for now, show the next 72 hours, or 72 grains, which ever is smaller - $duration=$resa_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 ""; - # pass (slice_id,slicename) as the [0,0] coordinate as thead>tr>td - echo ""; - # 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 ""; - } - echo ""; - // 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 ""; - $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 ""; - $counter=$lease['nuntil']; - } else { - echo ""; - $counter+=1; - } - } - echo ""; - } - echo "
" . $slice['slice_id'] . '&' . $slice['name'] . "" . implode("&",array($timestamp,$label)) . "
". $node['hostname'] . "" . $lease['lease_id'] . '&' . $lease['name'] . "
\n"; + // get settings from environment, otherwise set to defaults + // when to start, in hours in the future from now + $leases_offset=$_GET['leases_offset']; + if ( ! $leases_offset ) $leases_offset=0; + // how many timeslots to show + $leases_slots=$_GET['leases_slots']; + if ( ! $leases_slots ) $leases_slots = 48; + // offset in hours (in the future) from now + $leases_w = $_GET['leases_w']; + if ( ! $leases_w) $leases_w=14; + // number of timeslots to display + + $granularity=$api->GetLeaseGranularity(); + + // these elements are for passing data to the javascript layer + echo ""; + echo ""; + echo ""; + // ditto, and editable - very rough for now + echo "
"; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + echo "
"; + + // 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 ""; // the general layout for the scheduler echo <<< EOF
- +
EOF; @@ -676,7 +643,6 @@ EOF; //////////////////// node configuration panel - if ($first_time_configuration) $column_conf_visible = '1'; else @@ -700,20 +666,20 @@ print(""); print(""); print(""); print("
"); -print(""); -print(""); +print(""); +print(""); //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 << -
+
+
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 support@myslice.info. You can find more information about the MySlice project at http://trac.myslice.info. -hide message permanently +hide message permanently
EOF;