Changeset 824 for trunk/Modules

Timestamp:

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

Author:

chronos

Message:

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

Location:

trunk/Modules

Files:

• Network/Network.php (modified) (3 diffs)
• NetworkConfigLinux/Generators/Latency.php (added)
• NetworkConfigLinux/NetworkConfigLinux.php (modified) (2 diffs)
• Notify/Notify.php (modified) (3 diffs)

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; }