← Back to team overview

nagios-charmers team mailing list archive

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

 

Andrea Ieri has proposed merging ~aieri/nagios-charm:fix/1825489 into nagios-charm:master.

Commit message:
Make pagerduty_nagios.pl enqueue proxy aware

Requested reviews:
  Nagios Charm developers (nagios-charmers)

For more details, see:
https://code.launchpad.net/~aieri/nagios-charm/+git/nagios-charm/+merge/366303
-- 
Your team Nagios Charm developers is requested to review the proposed merge of ~aieri/nagios-charm:fix/1825489 into nagios-charm:master.
diff --git a/hooks/templates/pagerduty_nagios_cfg.tmpl b/hooks/templates/pagerduty_nagios_cfg.tmpl
index e5c8751..2a79de3 100644
--- a/hooks/templates/pagerduty_nagios_cfg.tmpl
+++ b/hooks/templates/pagerduty_nagios_cfg.tmpl
@@ -16,11 +16,12 @@ define contact {
 
 define command {
        command_name     notify-service-by-pagerduty
-       command_line     /usr/local/bin/pagerduty_nagios.pl enqueue -f pd_nagios_object=service -q {{ pagerduty_path }}
+       command_line     /usr/local/bin/pagerduty_nagios.pl enqueue {{ proxy_switch }} -f pd_nagios_object=service -q {{ pagerduty_path }}
 }
 
 define command {
        command_name     notify-host-by-pagerduty
-       command_line     /usr/local/bin/pagerduty_nagios.pl enqueue -f pd_nagios_object=host -q {{ pagerduty_path }}
+       command_line     /usr/local/bin/pagerduty_nagios.pl enqueue {{proxy_switch }} -f pd_nagios_object=host -q {{ pagerduty_path }}
+
 }
 

References