[nifi] branch support/nifi-1.x updated: NIFI-11921 Set CPU Load Average for C2 Heartbeats

[exceptionfactory]

This is an automated email from the ASF dual-hosted git repository.

exceptionfactory pushed a commit to branch support/nifi-1.x
in repository https://gitbox.apache.org/repos/asf/nifi.git


The following commit(s) were added to refs/heads/support/nifi-1.x by this push:
     new defc25299d NIFI-11921 Set CPU Load Average for C2 Heartbeats
defc25299d is described below

commit defc25299d8444270a63f2b62aa80193e6c51c2b
Author: Kalman Jantner <jant...@gmail.com>
AuthorDate: Tue Aug 8 16:25:07 2023 +0200

    NIFI-11921 Set CPU Load Average for C2 Heartbeats
    
    This closes #7584
    
    Signed-off-by: David Handermann <exceptionfact...@apache.org>
    (cherry picked from commit f8d0d2f9b63b6c3e5bf1522464af8108a8046740)
---
 .../org/apache/nifi/c2/client/service/C2HeartbeatFactory.java    | 2 +-
 .../main/java/org/apache/nifi/c2/protocol/api/SystemInfo.java    | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git 
a/c2/c2-client-bundle/c2-client-service/src/main/java/org/apache/nifi/c2/client/service/C2HeartbeatFactory.java
 
b/c2/c2-client-bundle/c2-client-service/src/main/java/org/apache/nifi/c2/client/service/C2HeartbeatFactory.java
index b157e8294e..8534536430 100644
--- 
a/c2/c2-client-bundle/c2-client-service/src/main/java/org/apache/nifi/c2/client/service/C2HeartbeatFactory.java
+++ 
b/c2/c2-client-bundle/c2-client-service/src/main/java/org/apache/nifi/c2/client/service/C2HeartbeatFactory.java
@@ -228,7 +228,7 @@ public class C2HeartbeatFactory {
 
         // getSystemLoadAverage is not available in Windows, so we need to 
prevent to send invalid data
         if (systemLoadAverage >= 0) {
-            systemInfo.setCpuUtilization(systemLoadAverage / (double) 
osMXBean.getAvailableProcessors());
+            systemInfo.setCpuLoadAverage(systemLoadAverage);
         }
 
         return systemInfo;
diff --git 
a/c2/c2-protocol/c2-protocol-api/src/main/java/org/apache/nifi/c2/protocol/api/SystemInfo.java
 
b/c2/c2-protocol/c2-protocol-api/src/main/java/org/apache/nifi/c2/protocol/api/SystemInfo.java
index 05c87cf2f3..cd07ef19b7 100644
--- 
a/c2/c2-protocol/c2-protocol-api/src/main/java/org/apache/nifi/c2/protocol/api/SystemInfo.java
+++ 
b/c2/c2-protocol/c2-protocol-api/src/main/java/org/apache/nifi/c2/protocol/api/SystemInfo.java
@@ -45,6 +45,7 @@ public class SystemInfo implements Serializable {
 
     @ApiModelProperty
     private Double cpuUtilization;
+    private Double cpuLoadAverage;
 
     public String getMachineArch() {
         return machineArch;
@@ -93,4 +94,12 @@ public class SystemInfo implements Serializable {
     public void setvCores(Integer vCores) {
         this.vCores = vCores;
     }
+
+    public Double getCpuLoadAverage() {
+        return cpuLoadAverage;
+    }
+
+    public void setCpuLoadAverage(Double cpuLoadAverage) {
+        this.cpuLoadAverage = cpuLoadAverage;
+    }
 }