Changeset 335 for trunk

Timestamp:

Dec 30, 2011, 9:19:03 AM (13 years ago)

Author:

chronos

Message:

• Upraveno: Přepracován netwatch import k zamezení chybného zaznamenávání více než 100% dostupnosti při duplicitních položkách v netwatch.
• Upraveno: Optimalizováno vyčítání údajů netwatch pokud je více podsítí na jednom směrovači, tak vyčítat seznam jenom jednou namísto samostatně pro každou podsíť.
• Přidáno: Ve seznamu podsítí nyní lze nastavit příznak Configure pro určení zda má být daný směrovač nastavován a používán pro statistiky.

Location:

trunk

Files:

• finance/import.php (modified) (1 diff)
• sql/updates/328.sql (added)
• sql/updates/335.sql (added)
• system/generators/netwatch.php (modified) (2 diffs)
• system/generators/netwatch_import.php (modified) (4 diffs)

trunk/finance/import.php

@@ -17 +17 @@
     } else
     {
-      $Output = 'Vložte CSV data z SYLK exportu české spořitelny';
+      $Output = 'Vložte CSV data z SYLK exportu Poštovní spořitelny';
       $Output .= '<form action="?Operation=prepare" method="post">';
       $Output .= '<textarea name="Source" cols="80" rows="20"></textarea><br/>';

trunk/system/generators/netwatch.php

@@ -11 +11 @@
 $Routerboard->Debug = true;
 
-$DbResult3 = $Database->query('SELECT DISTINCT (`DHCP`) FROM `NetworkSubnet`'); // WHERE `Member` = 0');
+$DbResult3 = $Database->query('SELECT DISTINCT (`DHCP`) FROM `NetworkSubnet` WHERE `Configure` = 1'); // WHERE `Member` = 0');
 while($Router = $DbResult3->fetch_assoc())
 {
@@ -17 +17 @@
   $Routerboard->HostName = $Router['DHCP'];
   $Items = array();
-  $DbResult = $Database->query('SELECT * FROM `NetworkSubnet` WHERE `DHCP`="'.$Router['DHCP'].'"');
+  $DbResult = $Database->query('SELECT * FROM `NetworkSubnet` WHERE (`Configure` = 1) AND (`DHCP`="'.$Router['DHCP'].'")');
   while($Subnet = $DbResult->fetch_assoc())
   {

trunk/system/generators/netwatch_import.php

@@ -12 +12 @@
   $StartTime = time();
 
-$DbResult3 = $Database->query('SELECT * FROM `NetworkSubnet` WHERE `Member` IS NULL');
+$DbResult3 = $Database->query('SELECT DISTINCT (`DHCP`), * FROM `NetworkSubnet` WHERE (`Configure` = 1) AND (`Member` IS NULL)');
 //echo($DbResult3->num_rows);
 while($Subnet = $DbResult3->fetch_assoc())
@@ -24 +24 @@
   foreach($List as $Properties)
   {
-    $SubnetAddress = new NetworkAddressIPv4();
-    $SubnetAddress->AddressFromString($Subnet['AddressRange']);
-    $SubnetAddress->Prefix = $Subnet['Mask'];
-    $Address = new NetworkAddressIPv4();
-    $Address->AddressFromString($Properties['host']);
-    $Address->Prefix = 32;
-    if($SubnetAddress->Contain($Address))
+    //echo($Properties['host'].', ');
+    if($Properties['status'] == 'up')
     {
-      //echo($Properties['host'].', ');
-      if($Properties['status'] == 'up')
-      {
-        $Online = 1;
-        $Values = array('Online' => $Online, 'LastOnline' => 'NOW()');
-        //echo($Properties['host']." up\n");
-      } else 
-      {
-        $Online = 0;
-        $Values = array('Online' => $Online);
-        //echo($Properties['host']." down\n");
-      }
+      $Online = 1;
+      $Values = array('Online' => $Online, 'LastOnline' => 'NOW()');
+      //echo($Properties['host']." up\n");
+    } else 
+    {
+      $Online = 0;
+      $Values = array('Online' => $Online);
+      //echo($Properties['host']." down\n");
+    }
 
-      $DbResult = $Database->update('NetworkInterface', '`LocalIP` = "'.$Properties['host'].'"', $Values);
-      if($Online == 1)
-      {
-        $DbResult = $Database->select('NetworkInterface', 'Id', '`LocalIP` = "'.$Properties['host'].'"');
-        $DbRow = $DbResult->fetch_assoc();
-        $InterfaceId = $DbRow['Id'];
-        $DbResult2 = $Database->select('NetworkInterfaceStat', '*', '(`NetworkInterface`="'.$InterfaceId.'") AND (`Time` = DATE_FORMAT(NOW(), "%Y-%m-%d %H:00:00"))');
-        if($DbResult2->num_rows == 0) $Database->query('REPLACE INTO `NetworkInterfaceStat` (`NetworkInterface`, `Time`) VALUES ("'.$InterfaceId.'", DATE_FORMAT(NOW(), "%Y-%m-%d %H:00:00"))');          
-        $Database->query('UPDATE `NetworkInterfaceStat` SET `PingCount` = `PingCount` + 1 WHERE (`NetworkInterface`="'.$InterfaceId.'") AND (`Time` = DATE_FORMAT(NOW(), "%Y-%m-%d %H:00:00"))');
-        
-      }
-    }
+    $DbResult = $Database->update('NetworkInterface', '`LocalIP` = "'.$Properties['host'].'"', $Values);
   }
 }
@@ -66 +47 @@
   $DbResult2 = $Database->select('NetworkInterface', 'SUM(`Online`) AS `SumOnline`', '`Device`='.$Device['Id']);
   $DbRow = $DbResult2->fetch_array();
-  if($DbRow['SumOnline'] > 0) $Online = 1; else $Online = 0;  
-  $Database->update('NetworkDevice', 'Id='.$Device['Id'], array('Online' => $Online));
-  if($Online == 1) $Database->update('NetworkDevice', 'Id='.$Device['Id'], array('LastOnline' => 'NOW()'));
+  if($DbRow['SumOnline'] > 0) $Online = 1; 
+    else $Online = 0;  
+  $Values = array('Online' => $Online);
+  if($Online == 1) $Values['LastOnline'] = 'NOW()';
+  $Database->update('NetworkDevice', 'Id='.$Device['Id'], $Values);
 }
 
@@ -79 +62 @@
 }
 
+// Update interface online statistics
+$DbResult = $Database->select('NetworkInterface', 'Id', '`Online` = 1');
+while($Interface = $DbResult->fetch_assoc())
+{
+  $DbResult2 = $Database->select('NetworkInterfaceStat', '*', '(`NetworkInterface`="'.$Interface['Id'].'") AND (`Time` = DATE_FORMAT(NOW(), "%Y-%m-%d %H:00:00"))');
+  if($DbResult2->num_rows == 0) $Database->query('REPLACE INTO `NetworkInterfaceStat` (`NetworkInterface`, `Time`, `PingCount`) VALUES ("'.$Interface['Id'].'", DATE_FORMAT(NOW(), "%Y-%m-%d %H:00:00"))', '1');          
+    $Database->query('UPDATE `NetworkInterfaceStat` SET `PingCount` = `PingCount` + 1 WHERE (`NetworkInterface`="'.$Interface['Id'].'") AND (`Time` = DATE_FORMAT(NOW(), "%Y-%m-%d %H:00:00"))');
+}
+
 ?>