Merge ~woutervb/charm-graylog:master into ~graylog-charmers/charm-graylog:master

Proposed by Wouter van Bommel
Status: Merged
Approved by: Barry Price
Approved revision: c02b439748d97c710043c77c31ae58336f20cb07
Merged at revision: 9c3135d4fcd2005fcbef9bb06e0bc7dd5060dc01
Proposed branch: ~woutervb/charm-graylog:master
Merge into: ~graylog-charmers/charm-graylog:master
Diff against target: 19 lines (+2/-2)
1 file modified
config.yaml (+2/-2)
Reviewer Review Type Date Requested Status
Barry Price Approve
Stuart Bishop (community) canonical-is-reviewers Approve
Canonical IS Reviewers Pending
Review via email: mp+367502@code.launchpad.net

Commit message

Made the nrpe checks less trigger happy

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
Stuart Bishop (stub) wrote :

Fine by me, but needs a more familiar ~graylog-charmers member to sign off on the behavioral change.

review: Approve (canonical-is-reviewers)
Revision history for this message
Barry Price (barryprice) wrote :

+1

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

Change successfully merged at revision 9c3135d4fcd2005fcbef9bb06e0bc7dd5060dc01

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/config.yaml b/config.yaml
index 21e76c6..7b4214b 100644
--- a/config.yaml
+++ b/config.yaml
@@ -76,12 +76,12 @@ options:
76 If left empty, the nagios_context will be used as the servicegroup.76 If left empty, the nagios_context will be used as the servicegroup.
77 nagios_uncommitted_warn:77 nagios_uncommitted_warn:
78 type: int78 type: int
79 default: 079 default: 1024
80 description: |80 description: |
81 Number of journaled uncommitted messages that will generate a nagios WARN81 Number of journaled uncommitted messages that will generate a nagios WARN
82 nagios_uncommitted_crit:82 nagios_uncommitted_crit:
83 type: int83 type: int
84 default: 10084 default: 2048
85 description: |85 description: |
86 Number of journaled uncommitted messages that will generate a nagios CRITICAL alert86 Number of journaled uncommitted messages that will generate a nagios CRITICAL alert
87 beats_port:87 beats_port:

Subscribers

People subscribed via source and target branches