Merge pull request #2 from ma-xiao-guang-64/master

update readme and fix bug
MyCATApache · Oct 31, 2018 · 3e1bf4d · 3e1bf4d
2 parents 4db7e1c + 98c2347
commit 3e1bf4d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -17,7 +17,7 @@
         cleanInteval: 86400
         
 ## 打包：
-mvn clean package。
+mvn clean package
 
 ## 运行：
 java -jar monitor-1.0.0.war

diff --git a/src/main/java/io/mycat/monitor/thread/JmxMetricFetcherThread.java b/src/main/java/io/mycat/monitor/thread/JmxMetricFetcherThread.java
@@ -68,8 +68,8 @@ public void run() {
                     long committedMemory = memoryUsage.getCommitted();
                     long maxMemory = memoryUsage.getMax();
                     BigDecimal processCpuLoad = new BigDecimal(Double.toString(operatingSystemMXBean.getProcessCpuLoad()));
-                    BigDecimal systemCpuLoad = new BigDecimal(Double.toString(operatingSystemMXBean.getProcessCpuLoad()));
-                    BigDecimal systemLoadAverage = new BigDecimal(Double.toString(operatingSystemMXBean.getProcessCpuLoad()));
+                    BigDecimal systemCpuLoad = new BigDecimal(Double.toString(operatingSystemMXBean.getSystemCpuLoad()));
+                    BigDecimal systemLoadAverage = new BigDecimal(Double.toString(operatingSystemMXBean.getSystemLoadAverage()));
                     int duration = (int) (System.currentTimeMillis() - startTimeMillis);
                     JmxMetric jmxMetric = new JmxMetric()
                             .setIp(escapeIps[i])

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
@@ -25,6 +25,6 @@ mybatis:
   config-location: classpath:mybatis.xml
 
 monitor:
-  ips: 10.0.5.77, 10.0.5.129, 10.0.5.136, 10.0.5.151, 10.0.5.196, 10.0.5.197
+  ips: 10.0.0.1, 10.0.0.2, 10.0.0.3
   fetchInteval: 10
   cleanInteval: 86400