Apache
/
nifi
mirror of https://github.com/apache/nifi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NIFI-10305 Fix network and cpu data in c2 heartbeat 

Signed-off-by: Pierre Villard <pierre.villard.fr@gmail.com>

This closes #6263.
This commit is contained in:
Ferenc Erdei 2022-08-01 12:23:18 +02:00 committed by Pierre Villard
parent fdf3925f81
commit 0fe4d13490
No known key found for this signature in database
GPG Key ID: F92A93B30C07C6D5
1 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
c2/c2-client-bundle/c2-client-service/src/main/java/org/apache/nifi/c2/client/service/C2HeartbeatFactory.java
View File

@ -146,22 +146,18 @@ public class C2HeartbeatFactory {
logger.debug("Instance has multiple interfaces. Generated information may be non-deterministic.");
}
NetworkInterface iface = operationIfaces.iterator().next();
Enumeration<InetAddress> inetAddresses = iface.getInetAddresses();
while (inetAddresses.hasMoreElements()) {
InetAddress inetAddress = inetAddresses.nextElement();
String hostAddress = inetAddress.getHostAddress();
String hostName = inetAddress.getHostName();
byte[] address = inetAddress.getAddress();
String canonicalHostName = inetAddress.getCanonicalHostName();
networkInfo.setDeviceId(iface.getName());
networkInfo.setHostname(hostName);
networkInfo.setIpAddress(hostAddress);
for (NetworkInterface networkInterface : operationIfaces) {
Enumeration<InetAddress> inetAddresses = networkInterface.getInetAddresses();
if (inetAddresses.hasMoreElements()) {
InetAddress inetAddress = inetAddresses.nextElement();
networkInfo.setDeviceId(networkInterface.getName());
networkInfo.setHostname(inetAddress.getHostName());
networkInfo.setIpAddress(inetAddress.getHostAddress());
break;
}
}
}
} catch (
Exception e) {
} catch (Exception e) {
logger.error("Network Interface processing failed", e);
}
return networkInfo;
@ -206,7 +202,12 @@ public class C2HeartbeatFactory {
OperatingSystemMXBean osMXBean = ManagementFactory.getOperatingSystemMXBean();
systemInfo.setMachineArch(osMXBean.getArch());
systemInfo.setOperatingSystem(osMXBean.getName());
systemInfo.setCpuUtilization(osMXBean.getSystemLoadAverage() / (double) osMXBean.getAvailableProcessors());
double systemLoadAverage = osMXBean.getSystemLoadAverage();
// getSystemLoadAverage is not available in Windows, so we need to prevent to send invalid data
if (systemLoadAverage >= 0) {
systemInfo.setCpuUtilization(systemLoadAverage / (double) osMXBean.getAvailableProcessors());
}
return systemInfo;
}