Issue #111: Fix LinuxIpNetwork

src/main/connector/hardware/LinuxIPNetwork/LinuxIPNetwork.yaml → src/main/connector/hardware/LinuxNetwork/LinuxIPNetwork/LinuxIPNetwork.yaml

@@ -1,6 +1,6 @@
 ---
 extends:
-- ../Hardware/Hardware
+- ../../Hardware/Hardware
 - ../LinuxNetwork-header/LinuxNetwork-header
 constants:
   GLOBAL_COMMAND_LINE: /sbin/ip a
@@ -19,4 +19,4 @@ connector:
     - Linux
     supersedes:
     - LinuxIfConfigNetwork
-    tags: [ hardware, linux ]
+    tags: [ hardware, linux ]

src/main/connector/hardware/LinuxIPNetwork/networkCollect.awk → src/main/connector/hardware/LinuxNetwork/LinuxIPNetwork/networkCollect.awk

@@ -8,7 +8,7 @@ BEGIN {
 }
 
 # ip a
-$2 ~ /^eth[0-9][0-9]*:?|^vmnic[0-9][0-9]*:?|^em[0-9]*:?|^[Pp][0-9][0-9]*[Pp][0-9][0-9]*:?|^en[os][0-9]*:?|^enp[0-9]*s[0-9]*:?/ {
+$1 ~/^[0-9]+:/ && $2 ~ /^.*:/ {
 	deviceID = $2
 	gsub(":", "", deviceID)
 }
@@ -29,5 +29,4 @@ $1 ~ /TX:/ && $2 ~ /bytes/ && $3 ~ /packets/ {
 
 END {
 	print "MSHW;" deviceID ";" receivePackets ";" transmitPackets ";" (receiveErrors + transmitErrors) ";" receiveBytes ";" transmitBytes
-}
-
+}

src/main/connector/hardware/LinuxIPNetwork/networkDiscovery.awk → src/main/connector/hardware/LinuxNetwork/LinuxIPNetwork/networkDiscovery.awk

@@ -2,16 +2,7 @@ BEGIN {
 	deviceID = ""
 }
 
-/^lo[0-9]* / {
-	deviceID = ""
-}
-
-# ip a
-$2 ~ /^lo[0-9]*/ {
-	deviceID = ""
-}
-
-$2 ~ /^eth[0-9][0-9]*:?|^vmnic[0-9][0-9]*:?|^em[0-9]*:?|^[Pp][0-9][0-9]*[Pp][0-9][0-9]*:?|^en[os][0-9]*:?|^enp[0-9]*s[0-9]*:?/ {
+$1 ~/^[0-9]+:/ && $2 ~ /^.*:/ {
 	deviceID = $2
 	gsub(":", "", deviceID)
 	ports[deviceID] = deviceID
@@ -39,5 +30,4 @@ END {
 			print "MSHW;" deviceID ";" macAddress[deviceID] ";" ipAddress[deviceID] ";"
 		}
 	}
-}
-
+}

src/main/connector/hardware/LinuxIfConfigNetwork/LinuxIfConfigNetwork.yaml → src/main/connector/hardware/LinuxNetwork/LinuxIfConfigNetwork/LinuxIfConfigNetwork.yaml

@@ -1,6 +1,6 @@
 ---
 extends:
-- ../Hardware/Hardware
+- ../../Hardware/Hardware
 - ../LinuxNetwork-header/LinuxNetwork-header
 constants:
   GLOBAL_COMMAND_LINE: /sbin/ifconfig -a
@@ -17,4 +17,4 @@ connector:
     - local
     appliesTo:
     - Linux
-    tags: [ hardware, linux ]
+    tags: [ hardware, linux ]

src/main/connector/hardware/LinuxIfConfigNetwork/networkCollect.awk → src/main/connector/hardware/LinuxNetwork/LinuxIfConfigNetwork/networkCollect.awk

@@ -8,7 +8,7 @@ BEGIN {
 }
 
 # ifconfig
-$1 ~ /^eth[0-9][0-9]*:?|^vmnic[0-9][0-9]*:?|^em[0-9]*:?|^[Pp][0-9][0-9]*[Pp][0-9][0-9]*:?|^en[os][0-9]*:?|^enp[0-9]*s[0-9]*:?/ {
+/^./ && ($2 ~ /flags/ || $2 ~ /Link/ && $3 ~ /encap/) {
 	deviceID = $1
 	gsub(":", "", deviceID)
 }
@@ -48,5 +48,4 @@ $1 == "TX" && $2 == "errors" {
 
 END {
 	print "MSHW;" deviceID ";" receivePackets ";" transmitPackets ";" (receiveErrors + transmitErrors) ";" receiveBytes ";" transmitBytes
-}
-
+}

src/main/connector/hardware/LinuxIfConfigNetwork/networkDiscovery.awk → src/main/connector/hardware/LinuxNetwork/LinuxIfConfigNetwork/networkDiscovery.awk

@@ -2,12 +2,8 @@ BEGIN {
 	deviceID = ""
 }
 
-/^lo[0-9]* / {
-	deviceID = ""
-}
-
 #ifconfig
-$1 ~ /^eth[0-9][0-9]*:?|^vmnic[0-9][0-9]*:?|^em[0-9]*:?|^[Pp][0-9][0-9]*[Pp][0-9][0-9]*:?|^en[os][0-9]*:?|^enp[0-9]*s[0-9]*:?/ {
+/^./ && ($2 ~ /flags/ || $2 ~ /Link/ && $3 ~ /encap/) {
 	deviceID = $1
 	gsub(":", "", deviceID)
 	ports[deviceID] = deviceID
@@ -19,9 +15,9 @@ $1 ~ /^eth[0-9][0-9]*:?|^vmnic[0-9][0-9]*:?|^em[0-9]*:?|^[Pp][0-9][0-9]*[Pp][0-9
 	}
 }
 
-/ +inet addr:[0-9]+/ {
-	ipAddress[deviceID] = $2
-	gsub("addr:", "", ipAddress[deviceID])
+/ +inet (addr:)?/ {
+    ipAddress[deviceID] = $2
+    gsub("addr:", "", ipAddress[deviceID])
 }
 
 (/ UP /) {
@@ -38,5 +34,4 @@ END {
 			print "MSHW;" deviceID ";" macAddress[deviceID] ";" ipAddress[deviceID] ";"
 		}
 	}
-}
-
+}

src/main/connector/hardware/LinuxNetwork-header/LinuxNetwork-header.yaml → src/main/connector/hardware/LinuxNetwork/LinuxNetwork-header/LinuxNetwork-header.yaml

@@ -28,14 +28,29 @@ monitors:
             keep: ^MSHW;
             separators: ;
             selectColumns: "2,3,4"
+        source(2):
+          # Discovery
+          # Source(2) = output of the command ls -l /sys/class/net
+          type: commandLine
+          commandLine: ls -l /sys/class/net
+          computes:
+            - type: awk
+              script: |
+                $0 !~ /virtual/ && $0 !~ /total/ {print $9}
+        source(3):
+          type: tableJoin
+          leftTable: ${source::monitors.network.discovery.sources.source(2)}
+          rightTable: ${source::monitors.network.discovery.sources.source(1)}
+          leftKeyColumn: 1
+          rightKeyColumn: 1
       mapping:
         # InstanceTable = Source(1)
-        source: ${source::monitors.network.discovery.sources.source(1)}
+        source: ${source::monitors.network.discovery.sources.source(3)}
         attributes:
           id: $1
-          physical_address: $2
+          physical_address: $3
           physical_address_type: MAC
-          logical_address: $3
+          logical_address: $4
           logical_address_type: IP
           hw.parent.type: enclosure
           name: $1
@@ -88,4 +103,4 @@ monitors:
           hw.network.io{direction="transmit"}: $6
           hw.network.up: legacyLinkStatus($8)
           hw.network.bandwidth.limit: megaBit2Byte($9)
-          hw.network.full_duplex: legacyFullDuplex($10)
+          hw.network.full_duplex: legacyFullDuplex($10)