From 7a52b375099af0dfeb0cf3011f6786ed258239e9 Mon Sep 17 00:00:00 2001 From: Lars Kruse Date: Wed, 4 Jul 2018 03:12:42 +0200 Subject: [PATCH] Plugins jstat__*: improve detection of default JAVA_HOME --- plugins/jvm/jstat__gccount | 7 +++++-- plugins/jvm/jstat__gctime | 7 +++++-- plugins/jvm/jstat__heap | 7 +++++-- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/plugins/jvm/jstat__gccount b/plugins/jvm/jstat__gccount index 276910ea..de61712d 100755 --- a/plugins/jvm/jstat__gccount +++ b/plugins/jvm/jstat__gccount @@ -33,12 +33,15 @@ # Config variables: # # pidfilepath - Which file path use. Defaults to '/var/run/jsvc.pid' -# javahome - Defaults to '/usr/local/java/jdk' +# javahome - override automatic detection of JRE directory # +default_java_home=/usr/lib/jvm/default-java +[ -e "$default_java_home" ] || default_java_home=/usr/local/java/jdk + pidfilepath=${pidfilepath:-/var/run/jsvc.pid} graphtitle=${graphtitle:-$pidfilepath} -JAVA_HOME=${javahome:-/usr/local/java/jdk} +JAVA_HOME=${javahome:-$default_java_home} export JAVA_HOME diff --git a/plugins/jvm/jstat__gctime b/plugins/jvm/jstat__gctime index aad1b702..fa6cab22 100755 --- a/plugins/jvm/jstat__gctime +++ b/plugins/jvm/jstat__gctime @@ -33,12 +33,15 @@ # Config variables: # # pidfilepath - Which file path use. Defaults to '/var/run/jsvc.pid' -# javahome - Defaults to '/usr/local/java/jdk' +# javahome - override automatic detection of JRE directory # +default_java_home=/usr/lib/jvm/default-java +[ -e "$default_java_home" ] || default_java_home=/usr/local/java/jdk + pidfilepath=${pidfilepath:-/var/run/jsvc.pid} graphtitle=${graphtitle:-$pidfilepath} -JAVA_HOME=${javahome:-/usr/local/java/jdk} +JAVA_HOME=${javahome:-$default_java_home} export JAVA_HOME diff --git a/plugins/jvm/jstat__heap b/plugins/jvm/jstat__heap index 3eaeae73..d510626f 100755 --- a/plugins/jvm/jstat__heap +++ b/plugins/jvm/jstat__heap @@ -33,12 +33,15 @@ # Config variables: # # pidfilepath - Which file path use. Defaults to '/var/run/jsvc.pid' -# javahome - Defaults to '/usr/local/java/jdk' +# javahome - override automatic detection of JRE directory # +default_java_home=/usr/lib/jvm/default-java +[ -e "$default_java_home" ] || default_java_home=/usr/local/java/jdk + pidfilepath=${pidfilepath:-/var/run/jsvc.pid} graphtitle=${graphtitle:-$pidfilepath} -JAVA_HOME=${javahome:-/usr/local/java/jdk} +JAVA_HOME=${javahome:-$default_java_home} export JAVA_HOME