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

Proposed by Paul Gear
Status: Merged
Merged at revision: c2c48615638aa1e9c7d6b6882a408dcdeb02597d
Proposed branch: ~paulgear/charm-nrpe/+git/nrpe-charm:ignore-kthreads
Merge into: ~nrpe-charmers/charm-nrpe:master
Diff against target: 27 lines (+3/-3)
2 files modified
config.yaml (+1/-1)
hooks/nrpe_helpers.py (+2/-2)
Reviewer Review Type Date Requested Status
Stuart Bishop (community) Approve
Review via email: mp+324840@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Stuart Bishop (stub) wrote :

Seems fine.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/config.yaml b/config.yaml
2index dfc80a1..bc5eee4 100644
3--- a/config.yaml
4+++ b/config.yaml
5@@ -47,7 +47,7 @@ options:
6 default: "auto"
7 type: string
8 description: Number of processes check or 'auto' for the charm to generate
9- thresholds based on processor count
10+ thresholds based on processor count. Kernel threads are ignored.
11 load:
12 default: "auto"
13 type: string
14diff --git a/hooks/nrpe_helpers.py b/hooks/nrpe_helpers.py
15index b102190..f8c1f15 100644
16--- a/hooks/nrpe_helpers.py
17+++ b/hooks/nrpe_helpers.py
18@@ -249,8 +249,8 @@ class SubordinateCheckDefinitions(dict):
19 procs = self.proc_count()
20
21 if hookenv.config('procs') == "auto":
22- proc_thresholds = "-w {} -c {}".format(25 * procs + 100,
23- 50 * procs + 100)
24+ proc_thresholds = "-k -w {} -c {}".format(25 * procs + 100,
25+ 50 * procs + 100)
26 else:
27 proc_thresholds = hookenv.config('procs')
28

Subscribers

People subscribed via source and target branches