NMS-16987, CPU/MEM utilization testing validations, branch update so …

…[skip ci]
OpenNMS · Dec 30, 2024 · be61b58 · be61b58
1 parent c0f089b
commit be61b58
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 13 deletions.
diff --git a/...va/org/opennms/features/datachoices/internal/usagestatistics/UsageStatisticsReporter.java b/...va/org/opennms/features/datachoices/internal/usagestatistics/UsageStatisticsReporter.java
@@ -104,7 +104,6 @@ public class UsageStatisticsReporter implements StateChangeHandler {
     private static final String JMX_ATTR_TOTAL_PHYSICAL_MEMORY_SIZE = "TotalPhysicalMemorySize";
     private static final String JMX_ATTR_AVAILABLE_PROCESSORS = "AvailableProcessors";
     private static final String JMX_ATTR_SYSTEM_CPU_LOAD = "SystemCpuLoad";
-    private static final String JMX_ATTR_PROCESS_CPU_LOAD = "ProcessCpuLoad";
     private static final String JMX_ATTR_TASKS_COMPLETED = "TasksCompleted";
     private static final String JMX_ATTR_COUNT = "Count";
     private static final String JMX_ATTR_UPDATES_COMPLETED = "UpdatesCompleted";
@@ -343,18 +342,9 @@ private void setSystemJmxAttributes(UsageStatisticsReportDTO usageStatisticsRepo
         if (systemCpuLoadObj != null) {
             double systemCpuLoad = (double)systemCpuLoadObj;
             if ( systemCpuLoad >= 0) {
-                systemCpuLoad = systemCpuLoad * 100;
+                systemCpuLoad *= 100;
                 usageStatisticsReport.setCpuUtilization(String.format("%.2f%%", systemCpuLoad));
             }
-        } else {
-            Object processCpuLoadObj = getJmxAttribute(JMX_OBJ_OS, JMX_ATTR_PROCESS_CPU_LOAD);
-            if (processCpuLoadObj != null) {
-                double processCpuLoad = (double)systemCpuLoadObj;
-                if ( processCpuLoad >= 0) {
-                    processCpuLoad = processCpuLoad * 100;
-                    usageStatisticsReport.setCpuUtilization(String.format("%.2f%%", processCpuLoad));
-                }
-            }
         }
 
         Object totalPhysicalMemorySizeObj = getJmxAttribute(JMX_OBJ_OS, JMX_ATTR_TOTAL_PHYSICAL_MEMORY_SIZE);

diff --git a/opennms-base-assembly/src/main/filtered/etc/jmx-datacollection-config.xml b/opennms-base-assembly/src/main/filtered/etc/jmx-datacollection-config.xml
@@ -23,9 +23,8 @@
          <rra>RRA:MIN:0.5:288:366</rra>
       </rrd>
       <mbeans>
-         <mbean name="System Metrics" objectname="java.lang:type=OperatingSystem">
+         <mbean name="CPU Metrics" objectname="java.lang:type=OperatingSystem">
             <attrib name="SystemCpuLoad" alias="CpuLoad" type="gauge"/>
-            <attrib name="ProcessCpuLoad" alias="ProcessCpuLoad" type="gauge"/>
          </mbean>
          <mbean name="OpenNMS Queued" objectname="OpenNMS:Name=Queued">
             <attrib name="CreatesCompleted" alias="ONMSQueCreates" type="counter"/>