Merge ~aieri/charm-nagios:fix/1825489 into ~nagios-charmers/charm-nagios:master

Proposed by Andrea Ieri
Status: Merged
Approved by: Andrea Ieri
Approved revision: 7216eb1ee65be17bc8ff4db7163fe0eab9b0aa18
Merged at revision: 517086976cd261320f00dd16c5bc9190b789ded9
Proposed branch: ~aieri/charm-nagios:fix/1825489
Merge into: ~nagios-charmers/charm-nagios:master
Diff against target: 18 lines (+3/-2)
1 file modified
hooks/templates/pagerduty_nagios_cfg.tmpl (+3/-2)
Reviewer Review Type Date Requested Status
Alvaro Uria (community) Approve
Review via email: mp+366303@code.launchpad.net

Commit message

Make pagerduty_nagios.pl enqueue proxy aware

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
Alvaro Uria (aluria) wrote :

Typo needs fixing. Other than that, +1.

review: Needs Fixing
Revision history for this message
Andrea Ieri (aieri) wrote :

Thanks for catching the typo. Fixed.

Revision history for this message
Alvaro Uria (aluria) wrote :

lgtm

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

Change successfully merged at revision 517086976cd261320f00dd16c5bc9190b789ded9

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/hooks/templates/pagerduty_nagios_cfg.tmpl b/hooks/templates/pagerduty_nagios_cfg.tmpl
2index e5c8751..6ce8577 100644
3--- a/hooks/templates/pagerduty_nagios_cfg.tmpl
4+++ b/hooks/templates/pagerduty_nagios_cfg.tmpl
5@@ -16,11 +16,12 @@ define contact {
6
7 define command {
8 command_name notify-service-by-pagerduty
9- command_line /usr/local/bin/pagerduty_nagios.pl enqueue -f pd_nagios_object=service -q {{ pagerduty_path }}
10+ command_line /usr/local/bin/pagerduty_nagios.pl enqueue {{ proxy_switch }} -f pd_nagios_object=service -q {{ pagerduty_path }}
11 }
12
13 define command {
14 command_name notify-host-by-pagerduty
15- command_line /usr/local/bin/pagerduty_nagios.pl enqueue -f pd_nagios_object=host -q {{ pagerduty_path }}
16+ command_line /usr/local/bin/pagerduty_nagios.pl enqueue {{ proxy_switch }} -f pd_nagios_object=host -q {{ pagerduty_path }}
17+
18 }
19

Subscribers

People subscribed via source and target branches