Merge ~xavpaice/charm-nrpe:update_docs into charm-nrpe:master

Proposed by Xav Paice
Status: Merged
Approved by: James Troup
Approved revision: 709c62656d7bfa0d4e05b69323d193e2aaa2a069
Merged at revision: 358b563672cf7b51f9f0f78ec46c4d146b5093d9
Proposed branch: ~xavpaice/charm-nrpe:update_docs
Merge into: charm-nrpe:master
Diff against target: 16 lines (+4/-1)
1 file modified
config.yaml (+4/-1)
Reviewer Review Type Date Requested Status
🤖 prod-jenkaas-bootstack (community) continuous-integration Approve
BootStack Reviewers Pending
BootStack Reviewers Pending
Review via email: mp+416501@code.launchpad.net

Commit message

update docs for nagios_master config

To post a comment you must log in.
Revision history for this message
🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack) wrote :

A CI job is currently in progress. A follow up comment will be added when it completes.

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
🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack) wrote :
review: Approve (continuous-integration)
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

Change successfully merged at revision 358b563672cf7b51f9f0f78ec46c4d146b5093d9

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 4494993..68bcd03 100644
3--- a/config.yaml
4+++ b/config.yaml
5@@ -3,7 +3,10 @@ options:
6 default: "None"
7 type: string
8 description: |
9- IP address of the nagios master from which to allow rsync access
10+ IP address of the nagios master from which to allow NRPE access, and/or
11+ rsync if export_nagios_definitions is set to True. This setting allows
12+ the Nagios servers listed to connect to NRPE in addition to any added
13+ by relation data.
14 server_port:
15 default: 5666
16 type: int

Subscribers

People subscribed via source and target branches

to all changes: