github-mirrors/logstash
1
0
Fork 0
mirror of https://github.com/elastic/logstash.git synced 2025-04-24 22:57:16 -04:00
Code Issues Projects Releases Packages Wiki Activity

#7239 fix timeunit on cpu time metric

Browse source 
Fixes #7240
This commit is contained in:
Armin 2017-05-27 15:02:15 -04:00 • committed by Armin Braun
parent 34014fbb27
commit c95e643209
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
logstash-core/src/main/java/org/logstash/instrument/monitors/ProcessMonitor.java
View file

@ -1,13 +1,12 @@
package org.logstash.instrument.monitors; package org.logstash.instrument.monitors;
import com.sun.management.UnixOperatingSystemMXBean; import com.sun.management.UnixOperatingSystemMXBean;
import javax.management.MBeanServer;
import java.lang.management.ManagementFactory; import java.lang.management.ManagementFactory;
import java.lang.management.OperatingSystemMXBean; import java.lang.management.OperatingSystemMXBean;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.Objects; import java.util.concurrent.TimeUnit;
import javax.management.MBeanServer;
/** /**
* Created by andrewvc on 5/12/16. * Created by andrewvc on 5/12/16.
@ -35,8 +34,9 @@ public class ProcessMonitor {
this.openFds = unixOsBean.getOpenFileDescriptorCount(); this.openFds = unixOsBean.getOpenFileDescriptorCount();
this.maxFds = unixOsBean.getMaxFileDescriptorCount(); this.maxFds = unixOsBean.getMaxFileDescriptorCount();
this.cpuMillisTotal = TimeUnit.MILLISECONDS.convert(
this.cpuMillisTotal = unixOsBean.getProcessCpuTime(); unixOsBean.getProcessCpuTime(), TimeUnit.NANOSECONDS
);
this.cpuProcessPercent = scaleLoadToPercent(unixOsBean.getProcessCpuLoad()); this.cpuProcessPercent = scaleLoadToPercent(unixOsBean.getProcessCpuLoad());
this.cpuSystemPercent = scaleLoadToPercent(unixOsBean.getSystemCpuLoad()); this.cpuSystemPercent = scaleLoadToPercent(unixOsBean.getSystemCpuLoad());