Merge ~nick-moffitt/content-cache-charm:nagios-fixes into content-cache-charm:master

[Nick Moffitt]

Allow per-location http results (401 etc)

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

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

[Joel Sing (jsing)]

LGTM, but see comments.

review: Approve (+1)

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

Change successfully merged at revision d9d48a032bd1be95e7cb602640f06cd6b0bd42bd

diff --git a/reactive/content_cache.py b/reactive/content_cache.py
index f6a9f5f..460f120 100644
--- a/reactive/content_cache.py
+++ b/reactive/content_cache.py
@@ -283,6 +283,8 @@ def configure_nagios():
             cmd = '/usr/lib/nagios/plugins/check_http -I 127.0.0.1 -H {site}' \
                   ' -p {port}{tls} -j {method} -u {url}{path}{token}' \
                   .format(site=site, port=frontend_port, method=method, url=url, path=path, token=token, tls=tls)
+            if 'nagios-expect' in loc_conf:
+                cmd = '{cmd} --expect="{expected}"'.format(cmd=cmd, expected=loc_conf['nagios-expect'])
             nrpe_setup.add_check(check_name, '{} site listen check'.format(site), cmd)
 
             # Cache layer check
@@ -290,6 +292,8 @@ def configure_nagios():
             cmd = '/usr/lib/nagios/plugins/check_http -I 127.0.0.1 -H {site}' \
                   ' -p {cache_port} -j {method} -u {url}{path}{token}' \
                   .format(site=site, cache_port=cache_port, method=method, url=url, path=path, token=token)
+            if 'nagios-expect' in loc_conf:
+                cmd = '{cmd} --expect="{expected}"'.format(cmd=cmd, expected=loc_conf['nagios-expect'])
             nrpe_setup.add_check(check_name, '{} cache check'.format(site), cmd)
 
             if backend_port: