Changeset 855

Timestamp:

Apr 8, 2018, 7:40:10 PM (6 years ago)

Author:

chronos

Message:

• Added: New table NetworkDeviceLog to store log messages received from network devices.

Location:

trunk

Files:

• Application/UpdateTrace.php (modified) (2 diffs)
• Application/Version.php (modified) (1 diff)
• Modules/Network/Network.php (modified) (5 diffs)

trunk/Application/UpdateTrace.php

@@ -2041 +2041 @@
 {
   $Manager->Execute('ALTER TABLE `DocumentLine` ADD `Yearly` BOOLEAN NOT NULL DEFAULT FALSE AFTER `Shortcut`;');
+}
+
+function UpdateTo855($Manager)
+{
+  $Manager->Execute('CREATE TABLE IF NOT EXISTS `NetworkDeviceLog` (
+    `Id` int(11) NOT NULL AUTO_INCREMENT,
+    `Time` datetime NOT NULL,
+    `Device` int(11) NOT NULL,
+    `Message` varchar(255) NOT NULL,
+    `Tags` varchar(255) NOT NULL,
+    PRIMARY KEY (`Id`),
+    KEY `Device` (`Device`)
+    ) ENGINE=InnoDB DEFAULT CHARSET=utf8;');
+  $Manager->Execute('ALTER TABLE `NetworkDeviceLog`
+    ADD CONSTRAINT `NetworkDeviceLog_ibfk_1` FOREIGN KEY (`Device`) REFERENCES `NetworkDevice` (`Id`);');
 }
 
@@ -2138 +2153 @@
       831 => array('Revision' => 838, 'Function' => 'UpdateTo838'),
       838 => array('Revision' => 844, 'Function' => 'UpdateTo844'),
+      844 => array('Revision' => 855, 'Function' => 'UpdateTo855'),
     ));
   }

trunk/Application/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 849; // Subversion revision
-$DatabaseRevision = 844; // SQL structure revision
-$ReleaseTime = strtotime('2017-09-05');
+$Revision = 855; // Subversion revision
+$DatabaseRevision = 855; // SQL structure revision
+$ReleaseTime = strtotime('2018-04-08');

trunk/Modules/Network/Network.php

@@ -142 +142 @@
     $this->System->RegisterPage(array('network', 'frequency-plan'), 'PageFrequencyPlan');
 
+    $this->System->RegisterCommandLine('config', array($this, 'ImportNetworkLog'));
+
     $this->System->FormManager->RegisterClass('NetworkDomainAlias', array(
       'Title' => 'Alias domény',
@@ -178 +180 @@
         'LoginPassword' => array('Type' => 'String', 'Caption' => 'Přihlašovací heslo', 'Default' => '', 'Null' => true, 'NotInList' => true),
         'API' => array('Type' => 'TDeviceAPIType', 'Caption' => 'API', 'Default' => '', 'Null' => true),
+        'Logs' => array('Type' => 'TDeviceLogList', 'Caption' => 'Záznamy', 'Default' => ''),
       ),
       'AfterInsert' => array($this, 'AfterInsertNetworkDevice'),
@@ -190 +193 @@
         'ShowOnline' => array('Type' => 'Boolean', 'Caption' => 'Ukázat online', 'Default' => '0'),
         'IconName' => array('Type' => 'String', 'Caption' => 'Jméno ikony', 'Default' => '0'),
+      ),
+    ));
+    $this->System->FormManager->RegisterClass('NetworkDeviceLog', array(
+      'Title' => 'Zprávy zařízení',
+      'Table' => 'NetworkDeviceLog',
+      'DefaultSortColumn' => 'Time',
+      'DefaultSortOrder' => 1,
+      'Items' => array(
+        'Time' => array('Type' => 'DateTime', 'Caption' => 'Čas', 'Default' => ''),
+        'Device' => array('Type' => 'TNetworkDevice', 'Caption' => 'Zařízení', 'Default' => ''),
+        'Message' => array('Type' => 'String', 'Caption' => 'Zpáva', 'Default' => ''),
+        'Tags' => array('Type' => 'String', 'Caption' => 'Značky', 'Default' => ''),
       ),
     ));
@@ -650 +665 @@
       'Filter' => '1',
     ));
+    $this->System->FormManager->RegisterFormType('TDeviceLogList', array(
+      'Type' => 'ManyToOne',
+      'Table' => 'NetworkDeviceLog',
+      'Id' => 'Id',
+      'Ref' => 'Device',
+      'Filter' => '1',
+    ));
     $this->System->FormManager->RegisterFormType('TNetworkLinkListInterface', array(
       'Type' => 'ManyToOne',
@@ -725 +747 @@
     $this->Database->query('DELETE FROM `NetworkInterfaceWireless` WHERE `NetworkInterface`='.$Id);
     $this->Database->query('DELETE FROM `NetworkInterfaceLatency` WHERE `Interface`='.$Id);
+  }
+  
+  function ImportNetworkLog($Parameters)
+  {
+    global $Config;
+    
+    $DbResult = $this->System->Database->select('NetworkDeviceLog', 'Time',
+      '1 ORDER BY Time DESC LIMIT 1');
+    if ($DbResult->num_rows > 0)
+    {
+      $DbRow = $DbResult->fetch_assoc();
+      $WhereTime = ' AND (`Time` > "'.$DbRow['Time'].'")';
+    } else $WhereTime = '';
+
+    $RemoteDb = new Database();
+    $RemoteDb->Connect($Config['NetworkLog']['Host'], $Config['NetworkLog']['User'], 
+      $Config['NetworkLog']['Password'], $Config['NetworkLog']['Database']);
+    $DbResult = $RemoteDb->select('SystemEvents', '*', '`ReceivedAt`>"'. TimeToMysqlDate($StartTime).'"'.$WhereTime.' ORDER BY `Time` DESC');
+    while ($DbRow = $DbResult->fetch_array())
+    {
+      $DbResult2 = $this->System->Database->select('NetworkInterface', 'Device, CONCAT(CONCAT_WS("-", `NetworkDevice`.`Name`, NULLIF(`NetworkInterface`.`Name`, "")), ".") AS `Name` ', '`Name` LIKE "'.$DbRow['FromHost'].'"');
+      if ($DbResult2->num_rows > 0)              
+      {
+        $DbRow2 = $DbResult2->fetch_assoc();
+        $DeviceID = $DbRow2['Device'];
+        $this->System->Database->insert('NetworkDeviceLog', array('Time' => $DbRow['ReceivedAt'], 
+          'Device' => $DeviceId, 'Message' => $DbRow['Message'], 'Tags' => $DbRow['SysLogTag']));
+      } else echo('Host '.$DbRow['Host'].' not paired with network device.'."\n");
+    }
   }