Changeset 13

Timestamp:

Oct 17, 2007, 7:06:49 PM (17 years ago)

Author:

george

Message:

Přidáno: Stránka pro přidání nového měření a implicitní hodnoty pro třídu Measure.
Přidání: Skript pro měření dostupnosti MaNGOS procesu worldd.
Přdáno: Automatické dosazování prefixů jednotek a zaokrouhlování na zadaný počet platných míst.

Files:

• admin.php (modified) (1 diff)
• classes.php (modified) (1 diff)
• config.sample.php (modified) (1 diff)
• global.php (modified) (2 diffs)
• graph.php (modified) (2 diffs)
• index.php (modified) (3 diffs)
• measure_scripts/traffic.php (modified) (3 diffs)
• stat_functions.php (modified) (1 diff)

admin.php

@@ -45 +45 @@
 }
 
+function ShowAdd()
+{
+  global $Database;
+  $Values = array();
+  return(ShowEditTable('Measure', $Values));
+}
+
 ?>

classes.php

@@ -3 +3 @@
 $Classes = array(
   'Measure' => array(
-    'Name' =>           array('Type' => 'String',   'Caption' => 'Zkratka'),
-    'Title' =>          array('Type' => 'String',   'Caption' => 'Název'),
-    'Description' =>    array('Type' => 'String',   'Caption' => 'Popis'),
-    'Unit' =>           array('Type' => 'String',   'Caption' => 'Jednotka'),
-    'Continuity' =>     array('Type' => 'Boolean',  'Caption' => 'Spojitost'),
-    'Period' =>         array('Type' => 'Integer',  'Caption' => 'Perioda mìøení'),
-    'PermissionAdd' =>  array('Type' => 'String',   'Caption' => 'Oprávnìní k mìøení'),
-    'PermissionView' => array('Type' => 'String',   'Caption' => 'Oprávnìní k prohlí¾ení'),
-    'Enabled' =>        array('Type' => 'Boolean',  'Caption' => 'Povolení'),
+    'Name' =>           array('Type' => 'String', 'Caption' => 'Zkratka', 'Default' => 'measure'),
+    'Title' =>          array('Type' => 'String', 'Caption' => 'Název', 'Default' => 'Mìøení'),
+    'Description' =>    array('Type' => 'String', 'Caption' => 'Popis', 'Default' => 'Mìøení velièiny'),
+    'Unit' =>           array('Type' => 'String', 'Caption' => 'Jednotka', 'Default' => ''),
+    'Continuity' =>     array('Type' => 'Boolean', 'Caption' => 'Spojitost', 'Default' => '0'),
+    'Period' =>         array('Type' => 'Integer', 'Caption' => 'Perioda mìøení', 'Default' => '60'),
+    'PermissionAdd' =>  array('Type' => 'String', 'Caption' => 'Oprávnìní k mìøení', 'Default' => 'localhost.localdomain'),
+    'PermissionView' => array('Type' => 'String', 'Caption' => 'Oprávnìní k prohlížení', 'Default' => 'all'),
+    'Enabled' =>        array('Type' => 'Boolean', 'Caption' => 'Povolení', 'Default' => '1'),
+    'DataType' =>       array('Type' => 'String', 'Caption' => 'Typ datových položek', 'Default' => 'int'),
+    'DataTable' =>      array('Type' => 'String', 'Caption' => 'Tabulka mìøených dat', 'Default' => 'data'),
   ),
 );

config.sample.php

@@ -30 +30 @@
     'Measure' => 1,
     'Period' => 'day',
-    'TimeSpecify' => 5,
+    'TimeSpecify' => 0,
   ),
 );

global.php

@@ -63 +63 @@
   foreach($Class as $Index => $Item)
   {
+    if(!array_key_exists($Index, $Values)) $Values[$Index] = $Item['Default']; 
     switch($Item['Type'])
     {
-      case 'Boolean': 
+      case 'Boolean':       
         if($Values[$Index] == 0) $Checked = ''; else $Checked = ' checked="yes"';
         $Edit = '<input type="checkbox" name="'.$Index.'"'.$Checked.'>';
@@ -80 +81 @@
     array_push($Table['Rows'], array($Item['Caption'], $Edit));
   }
-  $Output = '<h3>Tabulka '.$ClassName.'</h3>'.Table($Table).Link('?Operation=Add', 'Pøidat');
-  return($Output); }
+  $Output = '<h3>Tabulka '.$ClassName.'</h3>'.Table($Table).MakeLink('?Operation=Add2', 'Pøidat');
+  return($Output); 
+}
 
 ?>

graph.php

@@ -171 +171 @@
     $Y = $Height - 1 - ($VerticalLinesDistance * $I);
     //$Y = $Height - 1 - ($VerticalLinesDistance * $I / ($MaxValue - $MinValue) * $K * $Height);
-    $Text = round(($I * $VerticalLinesDistance / $Height / $K * ($MaxValue - $MinValue) + $MinValue));
+    $Text = AddPrefixMultipliers(round(($I * $VerticalLinesDistance / $Height / $K * ($MaxValue - $MinValue) + $MinValue)), $Measure['Unit'], 3);
     $BoundBox = imagettfbbox($FontSize, 0, $FontFile, $Text);
     if(($Y - ($BoundBox[5] - $BoundBox[1]) / 2) > 10)
@@ -178 +178 @@
   $GenerationTime = floor((GetMicrotime() - $StopWatchStart) * 1000  ) / 1000;
 
-  imagettftext($Image, $FontSize, 0, $Width-94, 14, $Red, $FontFile, "Max. ".$MaxValue.' '.$Measure['Unit']);
-  imagettftext($Image, $FontSize, 0, $Width-194, 14, $Green, $FontFile, "Avg.  ".$AvgValue.' '.$Measure['Unit']);
-  imagettftext($Image, $FontSize, 0, $Width-294, 14, $Blue, $FontFile, "Min.  ".$MinValue.' '.$Measure['Unit']);
+  imagettftext($Image, $FontSize, 0, $Width-94, 14, $Red, $FontFile, "Max. ".AddPrefixMultipliers($MaxValue, $Measure['Unit']));
+  imagettftext($Image, $FontSize, 0, $Width-194, 14, $Green, $FontFile, "Avg.  ".AddPrefixMultipliers($AvgValue, $Measure['Unit']));
+  imagettftext($Image, $FontSize, 0, $Width-294, 14, $Blue, $FontFile, "Min.  ".AddPrefixMultipliers($MinValue, $Measure['Unit']));
   imagestring($Image, 2, 50, 20, 'Vygenerováno za '.$GenerationTime.' sekund', $Black);
   //imagestring($Image, 2, 50, 30, 'Level: '.$Level, $Black);

index.php

@@ -174 +174 @@
 
 $Output .= '<table border="1" cellspacing="0" cellpadding="2" style="font-size: small;">';
-$Output .= '<tr><th>Mìøená velièina</th><th>Èas posledního mìøení</th><th>Poslední hodnota</th><th>Interpolace</th><th>Poznámky</th>';
+$Output .= '<tr><th>Mìøená velièina</th><th>Poslední hodnota</th><th>Èas posledního mìøení</th><th>Interpolace</th><th>Poznámky</th>';
 if(array_key_exists('Debug', $_GET)) $Output .= '<th>Poèet polo¾ek</th><th>Èas vykonání</th>';
 $Output .= '</tr>';
@@ -195 +195 @@
     $Row = $Result2->fetch_array();
     $LastMeasureTime = date('j.n.Y G:i:s', MysqlDateTimeToTime($Row['time']));
-    $LastMeasureValue = round($Row['avg'] / $Measure['Divider']);
+    $LastMeasureValue = AddPrefixMultipliers($Row['avg'], $Measure['Unit']);
   } else {
     $LastMeasureTime = '&nbsp;';
@@ -203 +203 @@
   if($Measure['Info'] == '') $Measure['Info'] = '&nbsp;';
   $GenerationTime = floor((GetMicrotime() - $StopWatchStart) * 1000  ) / 1000;
-  $Output .= '<tr><td><a href="?Measure='.$Measure['Id'].'">'.$Measure['Description'].'</a></td><td align="center">'.$LastMeasureValue.' '.$Measure['Unit'].'</td><td align="center">'.$LastMeasureTime.'</td><td align="center">'.$Interpolate.'</td><td>'.$Measure['Info'].'</td>';
+  $Output .= '<tr><td><a href="?Measure='.$Measure['Id'].'">'.$Measure['Description'].'</a></td><td align="center">'.$LastMeasureValue.'</td><td align="center">'.$LastMeasureTime.'</td><td align="center">'.$Interpolate.'</td><td>'.$Measure['Info'].'</td>';
   if(array_key_exists('Debug', $_GET)) $Output .= '<td>'.$RowCount.'</td><td>'.$GenerationTime.'</td>';
   $Output .= '</tr>';

measure_scripts/traffic.php

@@ -3 +3 @@
 include('../global.php');
 
+function CheckPortStatus($Ip, $Port)
+{
+  function ErrorHandler($errno,$errmsg,$filename,$linenum,$vars)
+  {
+  }  
+  set_error_handler('ErrorHandler');
+  //error_reporting(0);
+  if($Fp1 = fsockopen($Ip, $Port, $ERROR_NO, $ERROR_STR,(float)0.5))
+  {
+    fclose($Fp1);
+    return true;
+  } else
+  {
+    //echo($ERROR_NO.','.$ERROR_STR);
+    //die();
+    return false;
+  }
+  restore_error_handler();
+}
+
 function MemoryUsage()
 {
   $Output = array();
-  exec('free -m', $Output);
+  exec('free -b', $Output);
   $Row = $Output[2];
   while(strpos($Row, '  ') !== false) $Row = str_replace('  ', ' ', $Row);
@@ -99 +119 @@
   // Network load
   $NetworkStat = GetNetworkStat();
-  $Value = round($NetworkStat['eth1']['down_avg']/1024);
+  $Value = round($NetworkStat['eth1']['down_avg']);
   file_get_contents($URL.'?MeasureId=11&Value='.$Value);
-  $Value = round($NetworkStat['eth1']['up_avg']/1024);
+  $Value = round($NetworkStat['eth1']['up_avg']);
   file_get_contents($URL.'?MeasureId=12&Value='.$Value);
   
@@ -155 +175 @@
   $Value = $Row[0];
   file_get_contents($URL.'?MeasureId=6&Value='.$Value);
-    
+  
+  // MaNGOS worldd availability
+  if(CheckPortStatus('localhost', 8085)) $Value = 100; else $Value = 0;  
+  file_get_contents($URL.'?MeasureId=15&Value='.$Value);
+      
   sleep(60);
 }

stat_functions.php

@@ -2 +2 @@
 
 $ValueTypes = array('min', 'avg', 'max');
+$PrefixMultipliers = array(
+  array('y', 'yocto', pow(10, -24)),
+  array('z', 'zepto', pow(10, -21)),
+  array('a', 'atto', pow(10, -18)),
+  array('f', 'femto', pow(10, -15)),
+  array('p', 'piko', pow(10, -12)),
+  array('n', 'nano', pow(10, -9)),
+  array('u', 'mikro', pow(10, -6)),
+  array('m', 'mili', pow(10, -3)),
+  array('', '', pow(10, 0)),
+  array('k', 'kilo', pow(10, 3)),
+  array('M', 'mega', pow(10, 6)),
+  array('G', 'giga', pow(10, 9)),
+  array('T', 'tera', pow(10, 12)),
+  array('P', 'peta', pow(10, 15)),
+  array('E', 'exa', pow(10, 18)),
+  array('Z', 'zetta', pow(10, 21)),
+  array('Y', 'yotta', pow(10, 24)),  
+);
+
+function AddPrefixMultipliers($Value, $Unit, $Digits = 4)
+{
+  global $PrefixMultipliers;
+  if($Unit == '') return($Value);
+  $I = 8;
+  if($Value > 0) $II = 1; 
+  else if($Value < 0) $II = -1;
+  else $II = 0;
+  while((($Value / $PrefixMultipliers[$I + $II][2]) > $II) and (($I + $II) >= 0) and (($I + $II) <= count($PrefixMultipliers))) $I = $I + $II;
+  $Value = $Value / $PrefixMultipliers[$I][2];
+  
+  // Truncate digits count
+  for($II=2; $II > -1; $II--)
+  {
+    if($Value >= pow(10, $II))
+    {  
+      if($Digits < ($II + 1)) $RealDigits = $II + 1; else $RealDigits = $Digits; 
+      $Value = round($Value / pow(10, $II - $RealDigits + 1)) * pow(10, $II - $RealDigits + 1);
+      break;      
+    }
+  }
+    
+  return($Value.' '.$PrefixMultipliers[$I][0].$Unit);
+}
 
 function GetMicrotime()