Browse Source

Merge pull request #15934 from jasontedor/freebsd-load-average

Add load averages to OS stats on FreeBSD

Closes #15917
Jason Tedor 9 years ago
parent
commit
d5e20fb763

+ 3 - 2
core/src/main/java/org/elasticsearch/monitor/os/OsProbe.java

@@ -111,8 +111,9 @@ public class OsProbe {
      * Returns the system load averages
      */
     public double[] getSystemLoadAverage() {
-        if (Constants.LINUX) {
-            double[] loadAverage = readProcLoadavg("/proc/loadavg");
+        if (Constants.LINUX || Constants.FREE_BSD) {
+            final String procLoadAvg = Constants.LINUX ? "/proc/loadavg" : "/compat/linux/proc/loadavg";
+            double[] loadAverage = readProcLoadavg(procLoadAvg);
             if (loadAverage != null) {
                 return loadAverage;
             }

+ 3 - 0
core/src/main/resources/org/elasticsearch/bootstrap/security.policy

@@ -118,4 +118,7 @@ grant {
 
   // load averages on Linux
   permission java.io.FilePermission "/proc/loadavg", "read";
+
+  // load averages on FreeBSD
+  permission java.io.FilePermission "/compat/linux/proc/loadavg", "read";
 };