Changeset 720 for branches/0.4/web/addons/job_monarch/host_view.php

Timestamp:

03/21/13 21:53:01 (10 years ago)

Author:

ramonb

Message:

• cleanup

File:

• branches/0.4/web/addons/job_monarch/host_view.php (modified) (8 diffs)

branches/0.4/web/addons/job_monarch/host_view.php

@@ -25 +25 @@
 include_once "./libtoga.php";
 
-//$tpl = new TemplatePower( "templates/host_view.tpl" );
-//$tpl->assignInclude("extra", "templates/host_extra.tpl");
-//$tpl->prepare();
-
-function datetimeToEpoch( $datetime ) {
-
-        //printf("datetime = %s\n", $datetime );
+function datetimeToEpoch( $datetime ) 
+{
+
         $datetime_fields = explode( ' ', $datetime );
 
@@ -51 +47 @@
         $seconds = $time_fields[2];
 
-        //printf( "hours = %s minutes = %s seconds = %s\n", $hours, $minutes, $seconds );
-
         $timestamp = mktime( $hours, $minutes, $seconds, $months, $days, $years );
-
-        //printf( "timestamp = %s\n", $timestamp );
 
         return $timestamp;
 }
 
-function makeHostView() {
+function makeHostView() 
+{
 
     global $tpl, $metrics, $clustername, $hostname;
@@ -67 +60 @@
     global $job_start, $job_stop;
 
-    //print_r( $metrics );
-
-    //printf( "c %s\n", $clustername );
-
     $trd = new TarchRrdGraph( $clustername, $hostname );
     $rrdirs = $trd->getRrdDirs( $period_start, $period_stop );
@@ -100 +89 @@
 
     $hosts_up = $hosts_up[$hostname];
-    //print_r( $hosts_up );
 
     $tpl->assign("cluster", $clustername);
@@ -108 +96 @@
     $tpl->assign("range",$range);
 
-    if( !is_numeric( $period_start ) ) {
+    if( !is_numeric( $period_start ) ) 
+    {
         $period_start = datetimeToEpoch( $period_start );
     }
-    if( !is_numeric( $period_stop ) ) {
+    if( !is_numeric( $period_stop ) ) 
+    {
         $period_stop = datetimeToEpoch( $period_stop );
     }
@@ -122 +112 @@
     $cluster_url=rawurlencode($clustername);
     $tpl->assign("cluster_url", $cluster_url);
-    //$tpl->assign("graphargs", "h=$hostname&$get_metric_string&st=$cluster[LOCALTIME]&job_start=$job_start&job_stop=$job_stop&period_start=$period_start&period_stop=$period_stop");
     $tpl->assign("graphargs", "h=$hostname&$get_metric_string&job_start=$job_start&job_stop=$job_stop&period_start=$period_start&period_stop=$period_stop");
 
@@ -128 +117 @@
     $tpl->assign("node_view","./?p=2&c=$cluster_url&h=$hostname");
 
-    //# No reason to go on if this node is down.
-    //if ($hosts_down)
-    //   {
-    //      $tpl->printToScreen();
-    //      return;
-    //   }
-
     $tpl->assign("ip", $hosts_up[IP]);
 
     foreach ($mymetrics as $name => $v)
-       {
-           if ($v[TYPE] == "string" or $v[TYPE]=="timestamp" or $always_timestamp[$name])
-          {
-             # Long gmetric name/values will disrupt the display here.
-             if ($v[SOURCE] == "gmond") $s_metrics[$name] = $v;
-          }
-           elseif ($v[SLOPE] == "zero" or $always_constant[$name])
-          {
-             $c_metrics[$name] = $v;
-          }
-           else if ($reports[$metric])
-          continue;
-           else
-          {
-             //$graphargs = "c=$cluster_url&h=$hostname&v=$v[VAL]&m=$name"
-             //  ."&z=medium&st=$cluster[LOCALTIME]&job_start=$job_start&job_stop=$job_stop&period_start=$period_start&period_stop=$period_stop";
-             $graphargs = "c=$cluster_url&h=$hostname&m=$name"
+    {
+        if ($v[TYPE] == "string" or $v[TYPE]=="timestamp" or $always_timestamp[$name])
+        {
+            # Long gmetric name/values will disrupt the display here.
+            if ($v[SOURCE] == "gmond") $s_metrics[$name] = $v;
+        }
+        elseif ($v[SLOPE] == "zero" or $always_constant[$name])
+        {
+            $c_metrics[$name] = $v;
+        }
+        else if ($reports[$metric])
+        {
+            continue;
+        }
+        else
+        {
+            $graphargs = "c=$cluster_url&h=$hostname&m=$name"
                ."&z=medium&job_start=$job_start&job_stop=$job_stop&period_start=$period_start&period_stop=$period_stop";
-             # Adding units to graph 2003 by Jason Smith <smithj4@bnl.gov>.
-             if ($v[UNITS]) {
-            $encodeUnits = rawurlencode($v[UNITS]);
-            $graphargs .= "&vl=$encodeUnits";
-             }
-             $g_metrics[$name][graph] = $graphargs;
-          }
-       }
+            # Adding units to graph 2003 by Jason Smith <smithj4@bnl.gov>.
+            if ($v[UNITS]) 
+            {
+                $encodeUnits = rawurlencode($v[UNITS]);
+                $graphargs .= "&vl=$encodeUnits";
+            }
+            $g_metrics[$name][graph] = $graphargs;
+        }
+    }
     # Add the uptime metric for this host. Cannot be done in ganglia.php,
     # since it requires a fully-parsed XML tree. The classic contructor problem.
@@ -178 +161 @@
     # Show string metrics
     if (is_array($s_metrics))
-       {
-          ksort($s_metrics);
-          foreach ($s_metrics as $name => $v )
-         {
-        $tpl->newBlock("string_metric_info");
-        $tpl->assign("name", $name);
-        if( $v[TYPE]=="timestamp" or $always_timestamp[$name])
-           {
-              $tpl->assign("value", date("r", $v[VAL]));
-           }
-        else
-           {
-              $tpl->assign("value", "$v[VAL] $v[UNITS]");
-           }
-         }
-       }
+    {
+        ksort($s_metrics);
+        foreach ($s_metrics as $name => $v )
+        {
+            $tpl->newBlock("string_metric_info");
+            $tpl->assign("name", $name);
+            if( $v[TYPE]=="timestamp" or $always_timestamp[$name])
+            {
+                $tpl->assign("value", date("r", $v[VAL]));
+            }
+            else
+            {
+                $tpl->assign("value", "$v[VAL] $v[UNITS]");
+            }
+        }
+    }
 
     # Show constant metrics.
     if (is_array($c_metrics))
-       {
-          ksort($c_metrics);
-          foreach ($c_metrics as $name => $v )
-         {
-        $tpl->newBlock("const_metric_info");
-        $tpl->assign("name", $name);
-        $tpl->assign("value", "$v[VAL] $v[UNITS]");
-         }
-       }
+    {
+        ksort($c_metrics);
+        foreach ($c_metrics as $name => $v )
+        {
+            $tpl->newBlock("const_metric_info");
+            $tpl->assign("name", $name);
+            $tpl->assign("value", "$v[VAL] $v[UNITS]");
+        }
+    }
 
     # Show graphs.
     if (is_array($g_metrics))
-       {
-          ksort($g_metrics);
-
-          $i = 0;
-          foreach ( $g_metrics as $name => $v )
-         {
+    {
+        ksort($g_metrics);
+
+        $i = 0;
+        foreach ( $g_metrics as $name => $v )
+        {
             $tpl->newBlock("vol_metric_info");
             $tpl->assign("graphargs", $v[graph]);
             $tpl->assign("alt", "$hostname $name");
             if($i++ %2)
-               $tpl->assign("br", "<BR>");
+            {
+                $tpl->assign("br", "<BR>");
+            }
          }
-       }
+    }
 }
 
-    //$tpl->printToScreen();
 ?>