launchpad-reviewers team mailing list archive

[Colin Watson <mp+417797@xxxxxxxxxxxxxxxxxx>]

Colin Watson has proposed merging ~cjwatson/turnip:charm-clarify-nagios-hint into turnip:master.

Commit message:
charm: Clarify nagios hint on end-to-end failures

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/turnip/+git/turnip/+merge/417797

Directing SREs to bounce nfs-ganesha.service only really makes sense if all the appservers are showing end-to-end failures.  If only a single one is bad, it makes more sense to direct them to check the NFS mount on the client side.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/turnip:charm-clarify-nagios-hint into turnip:master.

diff --git a/charm/layer/turnip-base/lib/charms/turnip/base.py b/charm/layer/turnip-base/lib/charms/turnip/base.py
index b369a7b..68cf88f 100644
--- a/charm/layer/turnip-base/lib/charms/turnip/base.py
+++ b/charm/layer/turnip-base/lib/charms/turnip/base.py
@@ -324,8 +324,10 @@ def add_nagios_e2e_checks(nagios):
         nagios.add_check(
             [os.path.join(nrpe_dir(), 'check_git_refs'), url],
             name='check_turnip_git_refs_{}'.format(i),
-            description='Git E2E {} - hint: check nfs-ganesha status'.format(
-                url),
+            description=(
+                'Git E2E {} - hint: check nfs-ganesha.service if all '
+                'appservers are bad, otherwise check '
+                'srv-turnip-data.mount').format(url),
             context=config['nagios_context'])