honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Add load averages to OS stats on FreeBSD

Closes #15917
This commit is contained in:
Jason Tedor 2016-01-13 20:11:22 -05:00
parent 1ddfa42c2e 2839e351af
commit d5e20fb763
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/main/java/org/elasticsearch/monitor/os/OsProbe.java
View File

@ -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
core/src/main/resources/org/elasticsearch/bootstrap/security.policy
View File

@ -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";
};