Changeset 824

Timestamp:

Apr 4, 2016, 8:41:19 PM (8 years ago)

Author:

chronos

Message:

• Added: Network latency periodic measurement of network interfaces with local IP.

Location:

trunk

Files:

• Application/UpdateTrace.php (modified) (2 diffs)
• Application/Version.php (modified) (1 diff)
• Common/Global.php (modified) (1 diff)
• Modules/Network/Network.php (modified) (3 diffs)
• Modules/NetworkConfigLinux/Generators/Latency.php (added)
• Modules/NetworkConfigLinux/NetworkConfigLinux.php (modified) (2 diffs)
• Modules/Notify/Notify.php (modified) (3 diffs)

trunk/Application/UpdateTrace.php

@@ -2005 +2005 @@
    $Manager->Execute('ALTER TABLE `NetworkPortUpDown`
      ADD CONSTRAINT `NetworkPortUpDown_ibfk_1` FOREIGN KEY (`Port`) REFERENCES `NetworkPort` (`Id`);');
+}
+
+function UpdateTo824($Manager)
+{
+  $Manager->Execute('CREATE TABLE IF NOT EXISTS `NetworkInterfaceLatency` (
+    `Id` int(11) NOT NULL AUTO_INCREMENT,
+    `Time` datetime NOT NULL,
+    `Interface` int(11) NOT NULL,
+    `Value` float NOT NULL,
+    PRIMARY KEY (`Id`),
+    KEY `Interface` (`Interface`)
+    ) ENGINE=InnoDB DEFAULT CHARSET=utf8;');
+  $Manager->Execute('ALTER TABLE `NetworkInterfaceLatency`
+    ADD CONSTRAINT `NetworkInterfaceLatency_ibfk_1` FOREIGN KEY (`Interface`) REFERENCES `NetworkInterface` (`Id`);');
 }
 
@@ -2098 +2112 @@
       814 => array('Revision' => 817, 'Function' => 'UpdateTo817'),
       817 => array('Revision' => 818, 'Function' => 'UpdateTo818'),
+      818 => array('Revision' => 824, 'Function' => 'UpdateTo824'),
     ));
   }

trunk/Application/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 820; // Subversion revision
-$DatabaseRevision = 818; // SQL structure revision
-$ReleaseTime = strtotime('2016-03-20');
+$Revision = 824; // Subversion revision
+$DatabaseRevision = 824; // SQL structure revision
+$ReleaseTime = strtotime('2016-04-04');

trunk/Common/Global.php

@@ -365 +365 @@
     if($Delay < 0) $Delay = 0;
 
-    echo('Waiting '.$Delay.' seconds...'."\n");
+    echo('Waiting remaining '.$Delay.' of '.$Period.' seconds...'."\n");
     sleep($Delay);
   }

trunk/Modules/Network/Network.php

@@ -208 +208 @@
         'Wireless' => array('Type' => 'TNetworkInterfaceWirelessListInterface', 'Caption' => 'Bezdrátové spoje', 'Default' => ''),
         'Ports' => array('Type' => 'TDevicePortListInterface', 'Caption' => 'Síťové porty', 'Default' => ''),
+        'Latency' => array('Type' => 'TDeviceInterfaceLatencyListInterface', 'Caption' => 'Odezva sítě', 'Default' => ''),
       ),
       'AfterInsert' => array($this, 'AfterInsertNetworkInterface'),
@@ -257 +258 @@
         'LastOnline' => array('Type' => 'DateTime', 'Caption' => 'Naposledy běželo', 'Default' => '', 'ReadOnly' => true),
         'UpDown' => array('Type' => 'TNetworkPortUpDown', 'Caption' => 'Změny stavu', 'Default' => ''),
+      ),
+    ));
+    $this->System->FormManager->RegisterClass('NetworkInterfaceLatency', array(
+      'Title' => 'Sťová odezva',
+      'Table' => 'NetworkInterfaceLatency',
+      'Items' => array(
+        'Time' => array('Type' => 'DateTime', 'Caption' => 'Čas', 'Default' => ''),
+        'Interface' => array('Type' => 'TNetworkInterface', 'Caption' => 'Rozhraní', 'Default' => ''),
+        'Value' => array('Type' => 'Float', 'Caption' => 'Hodnota', 'Default' => '0', 'Suffix' => 'ms'),
       ),
     ));
@@ -583 +593 @@
       'Type' => 'ManyToOne',
       'Table' => 'NetworkPort',
+      'Id' => 'Id',
+      'Ref' => 'Interface',
+      'Filter' => '1',
+    ));
+    $this->System->FormManager->RegisterFormType('TDeviceInterfaceLatencyListInterface', array(
+      'Type' => 'ManyToOne',
+      'Table' => 'NetworkInterfaceLatency',
       'Id' => 'Id',
       'Ref' => 'Interface',

trunk/Modules/NetworkConfigLinux/NetworkConfigLinux.php

@@ -3 +3 @@
 include_once(dirname(__FILE__).'/Generators/DNS.php');
 include_once(dirname(__FILE__).'/Generators/CheckPorts.php');
+include_once(dirname(__FILE__).'/Generators/Latency.php');
 
 class ModuleNetworkConfigLinux extends AppModule
@@ -29 +30 @@
     $this->System->ModuleManager->Modules['NetworkConfig']->RegisterConfigItem('linux-dns', 'ConfigDNS');
     $this->System->ModuleManager->Modules['NetworkConfig']->RegisterConfigItem('linux-checkports', 'ConfigCheckPorts');
+    $this->System->ModuleManager->Modules['NetworkConfig']->RegisterConfigItem('linux-latency', 'ConfigLatency');
   }
 }

trunk/Modules/Notify/Notify.php

@@ -73 +73 @@
       }
     }
-    
+
     // Send content to users
     $DbResult = $this->Database->query('SELECT `NotifyUser`.`Id`, `NotifyUser`.`LastTime`, `User`.`Name`, `Contact`.`Value`, `Contact`.`Category` FROM `NotifyUser` '.
@@ -82 +82 @@
       $Time = time();
       $Output .= 'User '.$User['Name'].'<br/>';
-      
+
       $this->Database->update('NotifyUser', '`Id`='.$User['Id'], array('LastTime' => TimeToMysqlDateTime($Time)));
 
@@ -89 +89 @@
         $Mail->Subject = 'Notification';
         $Mail->AddTo($User['Value'], $User['Name']);
-        //$Mail->AddBody(strip_tags($Content), 'text/plain');
+        $Mail->AddBody(strip_tags($Content), 'text/plain');
         $Mail->AddBody('<style>
 table { border-collapse: collapse; }