From: Stephen Soltesz <soltesz@cs.princeton.edu>
Date: Wed, 24 Jun 2009 22:21:49 +0000 (+0000)
Subject: only send unknownsquence messages to admin list
X-Git-Tag: Monitor-3.0-18~19
X-Git-Url: http://git.onelab.eu/?p=monitor.git;a=commitdiff_plain;h=13b93b7152cc4789c9554ad11a2e1ffdd34a1304

only send unknownsquence messages to admin list
just use the PCU IP address if the hostname doesn't match the IP.
---

diff --git a/monitor/bootman.py b/monitor/bootman.py
index f64fb00..8dda341 100755
--- a/monitor/bootman.py
+++ b/monitor/bootman.py
@@ -744,6 +744,7 @@ def restore_basic(sitehist, hostname, config=None, forced_action=None):
 		args['bmlog'] = conn.get_bootmanager_log().read()
 		args['viart'] = False
 		args['saveact'] = True
+		args['ccemail'] = True
 
 		sitehist.sendMessage('unknownsequence_notice', **args)
 
@@ -783,6 +784,7 @@ def restore_basic(sitehist, hostname, config=None, forced_action=None):
 			args['bmlog'] = conn.get_bootmanager_log().read()
 			args['viart'] = False
 			args['saveact'] = True
+			args['ccemail'] = True
 
 			sitehist.sendMessage('unknownsequence_notice', **args)
 			conn.restart_bootmanager('boot')
diff --git a/monitor/database/info/interface.py b/monitor/database/info/interface.py
index e9a08a6..0a1437b 100644
--- a/monitor/database/info/interface.py
+++ b/monitor/database/info/interface.py
@@ -127,6 +127,7 @@ class SiteInterface(HistorySiteRecord):
 
 			message = getattr(mailtxt, type)
 
+			ccemail = False
 			saveact = True
 			viart = True
 			if 'viart' in kwargs: 
@@ -136,6 +137,9 @@ class SiteInterface(HistorySiteRecord):
 			if 'saveact' in kwargs: 
 				saveact = kwargs['saveact']
 
+			if 'ccemail' in kwargs: 
+				ccemail = kwargs['ccemail']
+
 			if viart:
 				self.getTicketStatus()		# get current message status
 				if self.db.message_status not in ['open', 'new']:
@@ -143,8 +147,10 @@ class SiteInterface(HistorySiteRecord):
 
 			m = Message(message[0] % args, message[1] % args, viart, self.db.message_id)
 
-			contacts = self.getContacts()
-			#contacts = [config.cc_email]
+			if ccemail:
+				contacts = [config.cc_email]
+			else:
+				contacts = self.getContacts()
 
 			print "sending message: %s to site %s for host %s" % (type, self.db.loginbase, hostname)
 
diff --git a/monitor/scanapi.py b/monitor/scanapi.py
index 5a72319..f5c4f5f 100644
--- a/monitor/scanapi.py
+++ b/monitor/scanapi.py
@@ -490,7 +490,7 @@ class ScanPCU(ScanInterface):
 						values['dns_status'] = "DNS-OK"
 					else:
 						values['dns_status'] = "DNS-MISMATCH"
-						continue_probe = False
+						values['plc_pcu_stats']['hostname'] = values['plc_pcu_stats']['ip']
 
 				except Exception, err:
 					values['dns_status'] = "DNS-NOENTRY"