Issue #111: Fix LinuxIpNetwork #157

MedMaalej · 2025-01-09T15:25:57Z

Refactor network interface detection logic in networkDiscovery.awk
Refactor network interface detection logic in networkCollect.awk
Update LinuxNetwork-header

* Refactor network interface detection logic in networkDiscovery.awk * Refactor network interface detection logic in networkCollect.awk * Update LinuxNetwork-header

bertysentry · 2025-01-09T17:04:21Z

While we're there, we should merge all Linux network connectors in the same directory!

* Refactor network interface detection logic in networkDiscovery.awk * Refactor network interface detection logic in networkCollect.awk * Update LinuxNetwork-header

* Refactor network interface detection logic in networkDiscovery.awk for LinuxIfconfigNetwork * Refactor network interface detection logic in networkCollect.awk for LinuxIfConfigNetwork * Update Hardware folder path reference in LinuxIpNetwork and LinuxIfConfigNetwork

* Merge LinuxIpNetwork, LinuxIfConfigNetwork and LinuxNetwork-header under LinuxNetwork folder

* Update interface name detection regex in LinuxIfConfigNetwork

…ommunity-connectors into feature/issue-111-Fix-LinuxIpNetwork

NassimBtk · 2025-01-15T09:17:07Z

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

@@ -19,7 +15,7 @@ $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]+/ {


We should still support addr:

NassimBtk · 2025-01-15T09:21:30Z

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]*:?/ {
+$1 ~ /:$/ && $2 ~ /flags/ {


Make sure flags is always available.

MedMaalej · 2025-01-16T13:31:24Z

I tested this PR using the hosts babbage and mm-docker-01 (mm-docker-01 uses Linux Debian and babbage uses CentOs)

mm-docker-01 (Debian)

Linux commands check

`ip a` result

Please note that here only en192 is a physical network interface ℹ️

`ls -l /sys/class/net` result

This command shows both physical and virtual network interfaces ℹ️

### ls -l /sys/class/net | awk $0 !~ /virtual/ && $0 !~ /total/ {print $9} result

ens192

This command shows only physical network interfaces names ℹ️

Prometheus metrics check

The following are the expected metrics of the LinuxIpNetwork connector

        hw.network.packets{direction="receive"}
        hw.network.packets{direction="transmit"}
        hw.errors{hw.type="network"}
        hw.network.io{direction="receive"}
        hw.network.io{direction="transmit"}
        hw.network.up: legacyLinkStatus
        hw.network.bandwidth.limit
        hw.network.full_duplex

All the metrics were reported ✅

Metricshub logs check

The expected attributes of the LinuxIpNetwork connector are:

        id
        physical_address
        physical_address_type
        logical_address
        logical_address_type
        hw.parent.type
        name

The expected number of monitors is 3 since we have only one physical network interface ens192 plus the connector and the host monitors. ✅

babbage (CentOs)

Linux commands check

`ip a` result

Please note that here only eno1 and eno2 are physical network interfaces ℹ️

`ls -l /sys/class/net` result

This command shows both physical and virtual network interfaces ℹ️

### ls -l /sys/class/net | awk $0 !~ /virtual/ && $0 !~ /total/ {print $9} result

eno1
eno2

This command shows only physical network interfaces names ℹ️

Metricshub logs check

The attributes were correctly retrieved ✅

The number of monitors is correct (4): eno1, eno2, the connector monitor and the host monitor ✅

rt-spectrum-ubuntu (Ubuntu)

This test covers both ifConfig and ip a commands.

Linux commands check

Metricshub logs check

5 monitors were collected (Only UP physical network interfaces were reported)

LinuxIPNetwork_network_ens160(Physical interface detected with Ip)
LinuxIfConfigNetwork_network_ens160 (Physical interface detected with IfConfig)
connector_LinuxIPNetwork (Ip connector)
connector_LinuxIfConfigNetwork (Ifconfig connector)
10.0.220.96 (host)

bertysentry · 2025-01-16T14:02:42Z

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

 #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/) {


The first regex is probably unnecessary:

Suggested change

/^./ && ($2 ~ /flags/ || $2 ~ /Link/ && $3 ~ /encap/) {

($2 ~ /flags/ || $2 ~ /Link/ && $3 ~ /encap/) {

The first regex is probably unnecessary:

@bertysentry Yes, you are right. It's an unnecessary. I removed it and checked the result again. It works.

bertysentry · 2025-01-16T14:07:58Z

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

@@ -1,6 +1,6 @@
 ---
 extends:
- ../Hardware/Hardware
+- ../../Hardware/Hardware


~~Lowercase or uppercase h for the directory name?~~

Sorry, don't bother! 😅

* Update interface name detection regex in LinuxIfConfigNetwork

…ommunity-connectors into feature/issue-111-Fix-LinuxIpNetwork

Issue #111: Fix LinuxIpNetwork

39b28c4

* Refactor network interface detection logic in networkDiscovery.awk * Refactor network interface detection logic in networkCollect.awk * Update LinuxNetwork-header

MedMaalej added the bug Something isn't working label Jan 9, 2025

MedMaalej self-assigned this Jan 9, 2025

Issue #111: Fix LinuxIpNetwork

3c1ccf3

* Refactor network interface detection logic in networkDiscovery.awk * Refactor network interface detection logic in networkCollect.awk * Update LinuxNetwork-header

NassimBtk marked this pull request as draft January 14, 2025 08:37

MedMaalej added 4 commits January 15, 2025 09:12

Issue #111: Fix LinuxIpNetwork

b5503c8

* Merge LinuxIpNetwork, LinuxIfConfigNetwork and LinuxNetwork-header under LinuxNetwork folder

Issue #111: Fix LinuxIpNetwork

4217562

* Update interface name detection regex in LinuxIfConfigNetwork

Merge branch 'main' of https://github.com/sentrysoftware/metricshub-c…

c333773

…ommunity-connectors into feature/issue-111-Fix-LinuxIpNetwork

NassimBtk reviewed Jan 16, 2025

View reviewed changes

MedMaalej marked this pull request as ready for review January 16, 2025 13:32

MedMaalej requested review from NassimBtk, MarcDouguedroit, bertysentry, TNohaic, FK-sentry, CherfaElyes and SafaeAJ January 16, 2025 13:32

bertysentry reviewed Jan 16, 2025

View reviewed changes

NassimBtk linked an issue Jan 16, 2025 that may be closed by this pull request

LinuxIPNetwork: Fails to monitor some Ethernet interfaces #111

Closed

NassimBtk added this to the 1.0.08 milestone Jan 16, 2025

MedMaalej added 2 commits January 17, 2025 09:28

Issue #111: Fix LinuxIpNetwork

1960d2a

* Update interface name detection regex in LinuxIfConfigNetwork

Merge branch 'main' of https://github.com/sentrysoftware/metricshub-c…

0fc86b8

…ommunity-connectors into feature/issue-111-Fix-LinuxIpNetwork

MedMaalej requested a review from bertysentry January 17, 2025 08:30

NassimBtk approved these changes Jan 17, 2025

View reviewed changes

NassimBtk merged commit ce367f0 into main Jan 17, 2025
1 check passed

NassimBtk deleted the feature/issue-111-Fix-LinuxIpNetwork branch January 17, 2025 08:40

MedMaalej added the developer_tested The changes are tested by the developer label Jan 17, 2025

NassimBtk removed this from the 1.0.08 milestone Jan 17, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Issue #111: Fix LinuxIpNetwork #157

Issue #111: Fix LinuxIpNetwork #157

MedMaalej commented Jan 9, 2025

bertysentry commented Jan 9, 2025

NassimBtk Jan 15, 2025

NassimBtk Jan 15, 2025

MedMaalej commented Jan 16, 2025

bertysentry Jan 16, 2025

MedMaalej Jan 17, 2025

bertysentry Jan 16, 2025 •

edited

Loading

	/^./ && ($2 ~ /flags/ \|\| $2 ~ /Link/ && $3 ~ /encap/) {
	($2 ~ /flags/ \|\| $2 ~ /Link/ && $3 ~ /encap/) {

Issue #111: Fix LinuxIpNetwork #157

Issue #111: Fix LinuxIpNetwork #157

Conversation

MedMaalej commented Jan 9, 2025

bertysentry commented Jan 9, 2025

NassimBtk Jan 15, 2025

Choose a reason for hiding this comment

NassimBtk Jan 15, 2025

Choose a reason for hiding this comment

MedMaalej commented Jan 16, 2025

mm-docker-01 (Debian)

Linux commands check

ip a result

ls -l /sys/class/net result

Prometheus metrics check

Metricshub logs check

babbage (CentOs)

Linux commands check

ip a result

ls -l /sys/class/net result

Metricshub logs check

rt-spectrum-ubuntu (Ubuntu)

Linux commands check

Metricshub logs check

bertysentry Jan 16, 2025

Choose a reason for hiding this comment

MedMaalej Jan 17, 2025

Choose a reason for hiding this comment

bertysentry Jan 16, 2025 • edited Loading

Choose a reason for hiding this comment

`ip a` result

`ls -l /sys/class/net` result

`ip a` result

`ls -l /sys/class/net` result

bertysentry Jan 16, 2025 •

edited

Loading