add pcu_name to pcufailed_notice

[monitor.git] / monitor / wrapper / emailTxt.py

diff --git a/monitor/wrapper/emailTxt.py b/monitor/wrapper/emailTxt.py
index 3afbe7b..3381d44 100644 (file)
--- a/monitor/wrapper/emailTxt.py
+++ b/monitor/wrapper/emailTxt.py
@@ -52,15 +52,33 @@ The registration is very quick.  All we need are: PCU hostname, IP, username,
 and password.  Then, choose which node to associate it with, and we will take 
 care of the rest.
 
+Thank you very much for your help,
+  -- %(plc_name)s (%(support_email)s)
+""")
+
+       pcuerror_notice=("""Please help us configure your PCU: %(pcu_name)s""",
+"""During our standard monitoring of your site we noticed that the following
+PCU is misconfigured:
+
+    %(pcu_name)s
+       %(pcu_errors)s
+You can learn more details about the problem by visiting the link below.
+
+    https://%(monitor_hostname)s/monitor/pcuview?loginbase=%(loginbase)s
+
+We would like to save you time by taking care of as many administrative situations for your site's machines as possible without disturbing you.  Errors like these prevent us from being able to remotely administer your machines, and so we must solicit your help using messages like these.
+
+So, any help and time that you can offer now to help us remotely administer your machines will pay off for you in the future.
+
 Thank you very much for your help,
   -- %(plc_name)s (%(support_email)s)
 """)
 
        pcufailed_notice =("""Could not use PCU to reboot %(hostname)s""",
 
-"""We tried to use the PCU registered for %(hostname)s, but for some reason 
-the host did not come back online.  You may be able to learn more by visiting
-this link:
+"""We tried to use the PCU registered for %(hostname)s, but for some reason the host did not come back online.  This may be for several reasons, and you can learn more by visiting this link:
+
+    %(pcu_name)s
 
     https://%(monitor_hostname)s/monitor/pcuview?loginbase=%(loginbase)s
 
@@ -71,7 +89,7 @@ We need your help resolving this issue in a few ways:
     that there is a problem with the PCU configuration, we can help you
     resolve that independently.
 
- 2. If it is possible, please correcct the above PCU problem, or let us know
+ 2. If it is possible, please correct the above PCU problem, or let us know
     what steps you are taking.  By enabling us to take administrative actions
     automatically without your intervention, you will save time in the future 
     the next time we need to reboot this machine, because we will be able to 
@@ -125,15 +143,15 @@ This notice is simply to let you know that:
     %(hostname)s
 
 has some ports that appear to be blocked, making the node unusable.  While
-some ports are open, to be a fully functional node, all ports need to be
-accessible at all times.  Please see the following for the list of
-requirements for hosting a node:
+some ports are open, a fully functional node needs all ports accessible at all
+times.  Please see the following for the list of requirements for hosting a
+node:
 
     http://www.planet-lab.org/hosting
 
-The node will be considered 'DOWN' until the ports are unblocked.
+We will consider the node 'DOWN' until the ports are unblocked.
 
-Please investigate, and let us know if there's anything we can do to help get
+Please investigate and let us know if there's anything we can do to help get
 it back on-line.  You can see more information about the current status of
 this host here:
 
@@ -219,9 +237,25 @@ Thank you for your help,
   -- %(plc_name)s (%(support_email)s)
 """)
 
+       noblockdevice_notice=("""Cannot Detect Disks on %(hostname)s""", 
+"""As part of PlanetLab node monitoring, we noticed that we were not able to detect any hard disks in your machine.  
+
+    %(hostname)s  
+
+This may be the case for a number of reasons:
+    * the hardware is very new and needs a new driver,
+    * the hardware is very old is no longer supported,
+    * the hard disk was physically removed, 
+    * the hard disk cable is loose or disconnected,
+
+Please help us investigate and let us know if there's anything that we can do to assist in getting your machine up and running again.
+
+Thank you for your help,
+  -- %(plc_name)s (%(support_email)s)
+""")
 
        newalphacd_notice=("""New Boot Images for %(hostname)s""", 
-"""As part of PlanetLab node monitoring, we noticed that we were not able to recognize all the hardware in your machine.  This means that it is so new that it needs a new BootCD, or that it is so old that it is no longer supported.
+"""As part of PlanetLab node monitoring, we noticed that we were not able to recognize all the hardware in your machine.  This means that either it is so new that it needs a new BootCD, or that it is so old that it is no longer supported.
 
     %(hostname)s