X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=dsa-nagios-checks%2Fchecks%2Fdsa-check-entropy;h=ddf1d92f395db019cfab709a16f7c6e96eac7483;hb=1958ea34ab7185bdf02aa33ea2970489e8c23bb4;hp=42bb5fd64183595dbba553c8e663a4236efdc2fe;hpb=c9f3bc1a03ecc92b3df1177270f1bc183cd433be;p=mirror%2Fdsa-nagios.git

diff --git a/dsa-nagios-checks/checks/dsa-check-entropy b/dsa-nagios-checks/checks/dsa-check-entropy
index 42bb5fd..ddf1d92 100755
--- a/dsa-nagios-checks/checks/dsa-check-entropy
+++ b/dsa-nagios-checks/checks/dsa-check-entropy
@@ -1,6 +1,7 @@
 #!/usr/bin/python
 
 # Copyright 2011 Peter Palfrader
+# Copyright 2014 Hendrik Koehler
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -37,7 +38,7 @@ parser.add_option("-s", "--sleep", dest="sleep", metavar="MSECS",
   help="Amount of time to wait between reads [250msec].")
 parser.add_option("-w", "--watermark", dest="watermark", metavar="BYTES",
   type="int", default=800,
-  help="Minimum number of expected bytes in the entropy pool.")
+  help="Minimum number of expected bytes in the entropy pool [800].")
 (options, args) = parser.parse_args()
 
 if len(args) != 0:
@@ -64,16 +65,16 @@ while tries <= options.retries:
 
     if avail >= options.watermark:
         if tries > 0:
-            print "OK: %d bytes in the pool after %d attempts."%(avail, tries)
+            print "OK: %d bytes in the pool after %d attempts.|entropy=%d bytes"%(avail, tries, avail)
         else:
-            print "OK: %d bytes in the pool."%(avail)
+            print "OK: %d bytes in the pool.|entropy=%d bytes"%(avail, avail)
         sys.exit(0)
 
     values.append(avail)
     time.sleep(1.0 * options.sleep / 1000)
     tries += 1
 
-print "WARNING: Too little entropy in the pool (min: %d, max: %d in %d reads)"%(min(values), max(values), tries)
+print "WARNING: Too little entropy in the pool (min: %d, max: %d in %d reads)|entropy=%d bytes"%(min(values), max(values), tries-1, avail)
 sys.exit(1)
 
 # vim:set et: