NRPE Charm

Merge ~mthaddon/charm-nrpe/+git/nrpe-charm:juju-set-readme into ~nrpe-charmers/charm-nrpe:master

  1. Git
  2. lp:~mthaddon/charm-nrpe/+git/nrpe-charm
  3. juju-set-readme
  4. Merge into master
Proposed by Tom Haddon
Status: Merged
Approved by: Junien F
Approved revision: 48c4e7984cf0e52c46712f133626af7d2a8d5539
Merged at revision: 3745c055d10d58502eeab221482420846b7198ba
Proposed branch: ~mthaddon/charm-nrpe/+git/nrpe-charm:juju-set-readme
Merge into: ~nrpe-charmers/charm-nrpe:master
Diff against target: 48 lines (+5/-6)
1 file modified
README.md (+5/-6)
Reviewer Review Type Date Requested Status
Junien F Approve
Review via email: mp+359043@code.launchpad.net

Commit message

Update readme for some typos and juju config vs. juju set

Description of the change

Update readme for some typos and juju config vs. juju set

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 3745c055d10d58502eeab221482420846b7198ba

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/README.md b/README.md
2index 6251bc7..1bf5824 100644
3--- a/README.md
4+++ b/README.md
5@@ -8,7 +8,7 @@ will pass a monitors yaml to nagios informing it of what checks to monitor.
6 Principal Relations
7 ===================
8
9-This charm can be attatched to any principal charm (via the juju-info relation)
10+This charm can be attached to any principal charm (via the juju-info relation)
11 regardless of whether it has implemented the local-monitors or
12 nrpe-external-master relations. For example,
13
14@@ -60,7 +60,7 @@ check\_load, check\_users, check\_disk\_root. All of the options for these are
15 configurable but sensible defaults have been set in config.yaml.
16 For example to increase the alert threshold for number of processes:
17
18-juju set nrpe load="-w 10,10,10 -c 25,25,25"
19+juju config nrpe load="-w 10,10,10 -c 25,25,25"
20
21 Default checks maybe disabled by setting them to the empty string.
22
23@@ -78,9 +78,9 @@ User Requested Checks
24
25 This works in the same way as the Principal requested except the monitors yaml
26 is set by the user via the monitors config option. For example to add a monitor
27-for the rsylog process:
28+for the rsyslog process:
29
30- juju set nrpe monitors="
31+ juju config nrpe monitors="
32 monitors:
33 local:
34 procrunning:
35@@ -170,7 +170,7 @@ out which contains:
36 # Check process nagios3 is running (user)
37 command[check_proc_nagios3_user]=/usr/lib/nagios/plugins/check_procs -w 1 -c 1 -C nagios3
38
39-and the monitors yaml passed to nagios would include:
40+And the monitors yaml passed to nagios would include:
41
42 monitors:
43 nrpe:
44@@ -225,4 +225,3 @@ The charm defines 2 actions, 'list-nrpe-checks' that gives a list of all the
45 nrpe checks defined for this unit and what commands they use. The other is
46 run-nrpe-check, which allows you to run a specified nrpe check and get the
47 output. This is useful to confirm if an alert is actually resolved.
48-

Subscribers

People subscribed via source and target branches