Merge ~paulgear/charm-nrpe/+git/nrpe-charm:ignore-kthreads into ~nrpe-charmers/charm-nrpe:master

[Paul Gear]

[Stuart Bishop (stub)]

Seems fine.

review: Approve

diff --git a/config.yaml b/config.yaml
index dfc80a1..bc5eee4 100644
--- a/config.yaml
+++ b/config.yaml
@@ -47,7 +47,7 @@ options:
     default: "auto"
     type: string
     description: Number of processes check or 'auto' for the charm to generate
-        thresholds based on processor count
+        thresholds based on processor count. Kernel threads are ignored.
   load:
     default: "auto"
     type: string
diff --git a/hooks/nrpe_helpers.py b/hooks/nrpe_helpers.py
index b102190..f8c1f15 100644
--- a/hooks/nrpe_helpers.py
+++ b/hooks/nrpe_helpers.py
@@ -249,8 +249,8 @@ class SubordinateCheckDefinitions(dict):
         procs = self.proc_count()
 
         if hookenv.config('procs') == "auto":
-            proc_thresholds = "-w {} -c {}".format(25 * procs + 100,
-                                                   50 * procs + 100)
+            proc_thresholds = "-k -w {} -c {}".format(25 * procs + 100,
+                                                      50 * procs + 100)
         else:
             proc_thresholds = hookenv.config('procs')