sensu-plugins-java 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 895f9098585c2dc97ec261ecab799d36fe290207
-  data.tar.gz: 3138e4d7dd08cbaf4d5dbeaa8bb030e4c45ec189
+  metadata.gz: eec29f729a7a98717093cff57fb3f57420a176cd
+  data.tar.gz: 540998b80a6cee2300e9b985c1710a580273df3a
 SHA512:
-  metadata.gz: a7a6610c073aa86ab9e6ffce8ffb810e73240677ff3d98f2e1da0752537f58e79007ce0c82102abfa9b706bc77a768974987c8b90eb8e1621e5f0900a5ee95a8
-  data.tar.gz: 51f0574f91320de3bb4d2ddf5930ce842291b1a2b5a4b9edcd01349c89991f63087ace945a362aff64b1713275a71ae41725b0635dd9fe369c9857179568808a
+  metadata.gz: 1b8b550f2e68bdbf54133fbed8256e7aa8f149e6e77e667e7de0ef8a0a49ac98c8bd2c75a9454f3f3333a99ed4d421236e1945a0acd339fc98bf87c8d87a6fcf
+  data.tar.gz: 8453f95a3c5bf25bdf15ac3b9a34db8f7d49f851be49d9f7b416636f975a70804e5825c84afd52a532f13acf4ce94143a3634bc7522760854d3955309f95b647

data/CHANGELOG.md

@@ -5,6 +5,10 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 
 ## [Unreleased]
 
+## [1.3.0] - 2017-09-05
+### Added
+- option `-l` to change if you wish to grab the max or the current heap limits (@Juan-Moreno)
+
 ## [1.2.0] - 2017-08-20
 ### Added
 - check-java-permgen.rb: added an option to specify java bin dir (@sovaa)
@@ -68,7 +72,8 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 ### Added
 - initial release
 
-[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-java/compare/1.1.0...HEAD
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-java/compare/1.3.0...HEAD
+[1.3.0]: https://github.com/sensu-plugins/sensu-plugins-java/compare/1.2.0...1.3.0
 [1.2.0]: https://github.com/sensu-plugins/sensu-plugins-java/compare/1.1.0...1.2.0
 [1.1.0]: https://github.com/sensu-plugins/sensu-plugins-java/compare/1.0.0...1.1.0
 [1.0.0]: https://github.com/sensu-plugins/sensu-plugins-java/compare/0.0.6...1.0.0

data/bin/check-java-heap-pcnt-java8.sh

@@ -6,29 +6,33 @@
 # Date: 2017-02-10
 # Modified: Nikoletta Kyriakidou
 
+# Date: 2018-08-30
+# Modified: Juan Moreno Martinez - Change MAX HEAP instead Current HEAP
+
 # You must have openjdk-8-jdk and openjdk-8-jre packages installed
 # http://openjdk.java.net/install/
 #
 # Also make sure the user "sensu" can sudo without password
 
 # #RED
-while getopts 'w:c:n:o:j:hp' OPT; do
+while getopts 'w:c:n:o:j:l:hp' OPT; do
   case $OPT in
     w)  WARN=$OPTARG;;
     c)  CRIT=$OPTARG;;
     n)  NAME=$OPTARG;;
     o)  OPTIONS=$OPTARG;;
     j)  JAVA_BIN=$OPTARG;;
+    l)  HEAP_MAX=$OPTARG;;
     h)  hlp="yes";;
     p)  perform="yes";;
     *)  unknown="yes";;
   esac
 done
 
+
 # usage
 HELP="
-    usage: $0 [ -n value -w value -c value -o value -p -h ]
-
+    usage: $0 [ -n value -w value -c value -o value -l value -p -h ]
         -n --> Name of JVM process < value
         -w --> Warning Percentage < value
         -c --> Critical Percentage < value
@@ -36,6 +40,16 @@ HELP="
         -j --> path to java bin dir (include trailing /)
         -p --> print out performance data
         -h --> print this help screen
+        -l --> limit, valid value max or current (default current)
+               current: when -Xms and -Xmx same value
+               max: when -Xms and -Xmx have different values
+
+Requirement: User that launch script must be permisions in sudoers for jps,jstat,jmap
+sudoers lines suggested:
+----------
+sensu ALL=(ALL) NOPASSWD: /usr/bin/jps, /usr/bin/jstat, /usr/bin/jmap
+Defaults:sensu !requiretty
+----------
 "
 
 if [ "$hlp" = "yes" ]; then
@@ -57,8 +71,15 @@ projectSize=$(printf "%s\n" $(printf "$PIDS" | wc -w))
 i=0
 for PID in $PIDS
 do
-	#Get heap capacity of JVM
-	TotalHeap=$(sudo ${JAVA_BIN}jstat -gccapacity $PID  | tail -n 1 | awk '{ print ($4 + $5 + $6 + $10) / 1024 }')
+  #Get heap capacity of JVM
+  if [ "$HEAP_MAX" == "" ] || [ "$HEAP_MAX" == "current" ]; then
+    TotalHeap=$(sudo ${JAVA_BIN}jstat -gccapacity $PID  | tail -n 1 | awk '{ print ($4 + $5 + $6 + $10) / 1024 }')
+  elif [[ "$HEAP_MAX" == "max" ]]; then
+    TotalHeap=$(sudo ${JAVA_BIN}jmap -heap $PID 2> /dev/null | grep MaxHeapSize | tr -s " " | tail -n1 | awk '{ print $3 /1024 /1024 }')
+  else
+    echo "limit options must be max or current"
+    exit 1
+  fi
 
 	#Determine amount of used heap JVM is using
 	UsedHeap=$(sudo ${JAVA_BIN}jstat -gc $PID  | tail -n 1 | awk '{ print ($3 + $4 + $6 + $8) / 1024 }')

data/bin/check-java-heap-pcnt.sh

@@ -9,19 +9,23 @@
 # Date: 2017-06-06
 # Modified: Nic Scott - re-work to be java version agnostic
 
+# Date: 2018-08-30
+# Modified: Juan Moreno Martinez - Change MAX HEAP instead Current HEAP and fix bug java agnostic
+
 # depends on jps and jstat in openjdk-devel in openjdk-<VERSION>-jdk and
 # openjdk-<VERSION>-jre packages being installed
 # http://openjdk.java.net/install/
 
 # Also make sure the user "sensu" can sudo jps and jstat without password
 
-while getopts 'w:c:n:o:j:hp' OPT; do
+while getopts 'w:c:n:o:j:l:hp' OPT; do
   case $OPT in
     w)  WARN=$OPTARG;;
     c)  CRIT=$OPTARG;;
     n)  NAME=$OPTARG;;
     o)  OPTIONS=$OPTARG;;
     j)  JAVA_BIN=$OPTARG;;
+    l)  HEAP_MAX=$OPTARG;;
     h)  hlp="yes";;
     p)  perform="yes";;
     *)  unknown="yes";;
@@ -30,7 +34,7 @@ done
 
 # usage
 HELP="
-usage: $0 [ -n value -w value -c value -o value -p -h ]
+usage: $0 [ -n value -w value -c value -o value -l value -p -h ]
   -n --> Name of JVM process < value
   -w --> Warning Percentage < value
   -c --> Critical Percentage < value
@@ -38,6 +42,16 @@ usage: $0 [ -n value -w value -c value -o value -p -h ]
   -j --> path to java bin dir (include trailing /)
   -p --> print out performance data
   -h --> print this help screen
+  -l --> limit, valid value max or current (default current)
+         current: when -Xms and -Xmx same value
+         max: when -Xms and -Xmx have different values
+
+Requirement: User that launch script must be permisions in sudoers for jps,jstat,jmap
+sudoers lines suggested:
+----------
+sensu ALL=(ALL) NOPASSWD: /usr/bin/jps, /usr/bin/jstat, /usr/bin/jmap
+Defaults:sensu !requiretty
+----------
 "
 
 if [ "$hlp" = "yes" ]; then
@@ -62,7 +76,7 @@ fi
 JSTAT=$(sudo ${JAVA_BIN}jstat -gc $PID  | tail -n 1)
 
 # Java 8 jstat -gc returns 17 columns Java 7 returns 15
-if [[ ${#JSTAT[@]} -gt 15 ]]; then
+if [[ $(echo $JSTAT| wc -w) -gt 15 ]]; then
   # Metaspace is not a part of heap in Java 8
   #Get heap capacity of JVM
   TotalHeap=$(echo $JSTAT | awk '{ print ($1 + $2 + $5 + $7) / 1024 }')
@@ -76,6 +90,14 @@ else
   UsedHeap=$(echo $JSTAT | awk '{ print ($3 + $4 + $6 + $8 + $10) / 1024 }')
 fi
 
+
+if [[ "$HEAP_MAX" == "max" ]]; then
+  TotalHeap=$(sudo ${JAVA_BIN}jmap -heap $PID 2> /dev/null | grep MaxHeapSize | tr -s " " | tail -n1 | awk '{ print $3 /1024 /1024 }')
+elif [ "$HEAP_MAX" != "" ] && [ "$HEAP_MAX" != "current" ]; then
+  echo "limit options must be max or current"
+  exit 3
+fi
+
 #Get heap usage percentage
 HeapPer=$(echo "scale=3; $UsedHeap / $TotalHeap * 100" | bc -l| cut -d "." -f1)
 

data/bin/java-heap-pcnt.sh

@@ -6,17 +6,21 @@
 # Date: 2013-9-30
 # Modified: Mario Harvey - badmadrad.com
 
+# Date: 2018-08-30
+# Modified: Juan Moreno Martinez - Change MAX HEAP instead Current HEAP
+
 # You must have openjdk-7-jdk and openjdk-7-jre packages installed
 # http://openjdk.java.net/install/
 
 # Also make sure the user "sensu" can sudo without password
 
 # #RED
-while getopts 'w:c:n:hp' OPT; do
+while getopts 'w:c:n:l:hp' OPT; do
   case $OPT in
     w)  WARN=$OPTARG;;
     c)  CRIT=$OPTARG;;
     n)  NAME=$OPTARG;;
+    l)  HEAP_MAX=$OPTARG;;
     h)  hlp="yes";;
     p)  perform="yes";;
     *)  unknown="yes";;
@@ -32,6 +36,16 @@ HELP="
         -c --> Critical Percentage < value
         -p --> print out performance data
         -h --> print this help screen
+        -l --> limit, valid value max or current (default current)
+               current: when -Xms and -Xmx same value
+               max: when -Xms and -Xmx have different values
+
+Requirement: User that launch script must be permisions in sudoers for jps,jstat,jmap
+sudoers lines suggested:
+----------
+sensu ALL=(ALL) NOPASSWD: /usr/bin/jps, /usr/bin/jstat, /usr/bin/jmap
+Defaults:sensu !requiretty
+----------
 "
 
 if [ "$hlp" = "yes" ]; then
@@ -53,8 +67,14 @@ if [ $COUNT != 1 ]; then
 fi
 
 #Get heap capacity of JVM
-TotalHeap=$(sudo jstat -gccapacity $PID  | tail -n 1 | awk '{ print ($4 + $5 + $6 + $10) / 1024 }')
-
+if [ "$HEAP_MAX" == "" ] || [ "$HEAP_MAX" == "current" ]; then
+  TotalHeap=$(sudo ${JAVA_BIN}jstat -gccapacity $PID  | tail -n 1 | awk '{ print ($4 + $5 + $6 + $10) / 1024 }')
+elif [[ "$HEAP_MAX" == "max" ]]; then
+  TotalHeap=$(sudo ${JAVA_BIN}jmap -heap $PID 2> /dev/null | grep MaxHeapSize | tr -s " " | tail -n1 | awk '{ print $3 /1024 /1024 }')
+else
+  echo "limit options must be max or current"
+  exit 1
+fi
 #Determine amount of used heap JVM is using
 UsedHeap=$(sudo jstat -gc $PID  | tail -n 1 | awk '{ print ($3 + $4 + $6 + $8 + $10) / 1024 }')
 

data/bin/metrics-java-heap-graphite-java8.sh

@@ -4,6 +4,9 @@
 
 # Modified: Nikoletta Kyriakidou
 
+# Date: 2018-08-30
+# Modified: Juan Moreno Martinez - Add MAX HEAP metric
+
 # You must have openjdk-8-jdk and openjdk-8-jre packages installed
 # http://openjdk.java.net/install/
 
@@ -37,6 +40,9 @@ NAME=${NAME:=0}
 PID=$(sudo jps | grep " $NAME$" | awk '{ print $1}')
 for PID in $PIDS
 do
+  #Get max heap capacity of JVM
+  MaxHeap=$(sudo jmap -heap $PID 2> /dev/null | grep MaxHeapSize | tr -s " " | tail -n1 | awk '{ print $3 /1024 /1024 }')
+
   #Get heap capacity of JVM
   TotalHeap=$(sudo jstat -gccapacity $PID  | tail -n 1 | awk '{ print ($4 + $5 + $6 + $10) / 1024 }')
 
@@ -60,6 +66,7 @@ do
 		project=$projectName
 	fi
 
+  echo "JVMs.$SCHEME.$project.Max_Heap $MaxHeap `date '+%s'`"
   echo "JVMs.$SCHEME.$project.Committed_Heap $TotalHeap `date '+%s'`"
   echo "JVMs.$SCHEME.$project.Used_Heap $UsedHeap `date '+%s'`"
   echo "JVMs.$SCHEME.$project.Eden_Util $ParEden `date '+%s'`"

data/bin/metrics-java-heap-graphite.sh

@@ -7,6 +7,9 @@
 # Date: 2017-06-06
 # Modified: Nic Scott - re-work to be java version agnostic
 
+# Date: 2018-08-30
+# Modified: Juan Moreno Martinez - Add MAX HEAP metric and fix bug java agnostic
+
 # depends on jps and jstat in openjdk-devel in openjdk-<VERSION>-jdk and
 # openjdk-<VERSION>-jre packages being installed
 # http://openjdk.java.net/install/
@@ -49,6 +52,9 @@ do
   JSTAT=$(sudo ${JAVA_BIN}jstat -gc $PID  | tail -n 1)
 
   # Java version indifferent memory stats
+  #Determine MaxHeap
+  MaxHeap=$(sudo jmap -heap $PID 2> /dev/null | grep MaxHeapSize | tr -s " " | tail -n1 | awk '{ print $3 /1024 /1024 }')
+
   #Determine Old Space Utilization
   OldGen=$(echo $JSTAT | awk '{ print ($8) / 1024 }')
 
@@ -60,7 +66,7 @@ do
 
   # Java version-specific memory stats
   # Java 8 jstat -gc returns 17 columns Java 7 returns 15
-  if [[ ${#JSTAT[@]} -gt 15 ]]; then
+  if [[ $(echo $JSTAT| wc -w) -gt 15 ]]; then
     # Metaspace is NOT a part of heap in Java 8
     #Get heap capacity of JVM
     TotalHeap=$(echo $JSTAT | awk '{ print ($1 + $2 + $5 + $7) / 1024 }')
@@ -88,6 +94,7 @@ do
     echo "JVMs.$SCHEME.$project.Perm_Capacity $TotalPerm `date '+%s'`"
     echo "JVMs.$SCHEME.$project.Perm_Util $UsedPerm `date '+%s'`"
   fi
+  echo "JVMs.$SCHEME.$project.Max_Heap $MaxHeap `date '+%s'`"
   echo "JVMs.$SCHEME.$project.Committed_Heap $TotalHeap `date '+%s'`"
   echo "JVMs.$SCHEME.$project.Heap_Util $UsedHeap `date '+%s'`"
   echo "JVMs.$SCHEME.$project.Eden_Util $ParEden `date '+%s'`"

data/lib/sensu-plugins-java/version.rb

@@ -1,7 +1,7 @@
 module SensuPluginsJava
   module Version
     MAJOR = 1
-    MINOR = 2
+    MINOR = 3
     PATCH = 0
 
     VER_STRING = [MAJOR, MINOR, PATCH].compact.join('.')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-java
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Sensu-Plugins and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-20 00:00:00.000000000 Z
+date: 2017-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sensu-plugin
@@ -216,7 +216,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Sensu plugins for Java