Merge ~aieri/charm-nagios:bug/1807368 into ~nagios-charmers/charm-nagios:master

[Andrea Ieri]

When configuring the pagerduty cronjob, prefer juju-*-proxy variables if they are available.

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

[Chris Sanders (chris.sanders)]

review: Approve

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision c14eccecaad34e401d5df7ef436bb63faba60d4d

diff --git a/hooks/upgrade-charm b/hooks/upgrade-charm
index 8349c36..f9cd034 100755
--- a/hooks/upgrade-charm
+++ b/hooks/upgrade-charm
@@ -115,10 +115,9 @@ def enable_pagerduty_config():
         hookenv.log("Pagerduty is enabled")
         fetch.apt_update()
         fetch.apt_install('libhttp-parser-perl')
-        if 'https_proxy' in os.environ:
-            proxy_switch = '--proxy {}'.format(os.environ['https_proxy'])
-        else:
-            proxy_switch = ''
+        env = os.environ
+        proxy = env.get('JUJU_CHARM_HTTPS_PROXY') or env.get('https_proxy')
+        proxy_switch = '--proxy {}'.format(proxy) if proxy else ''
 
         # Ship the pagerduty_nagios.cfg file
         template_values = {'enable_pagerduty': enable_pagerduty,