Merge ~mthaddon/charm-nrpe/+git/nrpe-charm:load-config-doc into ~nrpe-charmers/charm-nrpe:master

Proposed by Tom Haddon
Status: Merged
Approved by: Junien F
Approved revision: af42870de93ca714a2d99c6bb349ed33f9947cb9
Merged at revision: 4ff81ff089cc03d5a378289813fa17b33796e4db
Proposed branch: ~mthaddon/charm-nrpe/+git/nrpe-charm:load-config-doc
Merge into: ~nrpe-charmers/charm-nrpe:master
Diff against target: 17 lines (+4/-2)
1 file modified
config.yaml (+4/-2)
Reviewer Review Type Date Requested Status
Junien F Approve
Review via email: mp+359040@code.launchpad.net

Commit message

Update docs in config.yaml for load to reflect reality

Description of the change

Update docs in config.yaml for load to reflect reality

To post a comment you must log in.
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

Revision history for this message
Junien F (axino) wrote :

+1

review: Approve
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

Change successfully merged at revision 4ff81ff089cc03d5a378289813fa17b33796e4db

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 1a967b5..1448e04 100644
3--- a/config.yaml
4+++ b/config.yaml
5@@ -77,8 +77,10 @@ options:
6 type: string
7 description: |
8 Load check arguments (e.g. "-w 8,8,8 -c 15,15,15"); if 'auto' is set,
9- then NUM_CPUS*0.7 is used for the warning threshold and NUM_CPUS for
10- critical.
11+ thresholds will be set to multipliers of processor count for 1m, 5m
12+ and 15m thresholds, with warning as "(4, 2, 1)", and critical set to
13+ "(8, 4, 2)". So if you have two processors, you'd get thresholds of
14+ "-w 8,4,2 -c 16,8,4".
15 .
16 Set to '' in order to disable this check.
17 conntrack:

Subscribers

People subscribed via source and target branches