merge from 2.0 branch

diff --git a/monitor-server.init b/monitor-server.init
index a2cab5a..5ffe974 100644 (file)
--- a/monitor-server.init
+++ b/monitor-server.init
@@ -268,8 +268,8 @@ Redirect /monitor https://${PLC_MONITOR_HOST}:${PLC_WWW_SSL_PORT}/monitor/
     #Errorlog /var/log/httpd/monitorwebapp-error_log
     #Customlog /var/log/httpd/monitorwebapp-access_log common
 
-    ProxyPass http://127.0.0.1:8080/
-    ProxyPassReverse http://127.0.0.1:8080/
+    ProxyPass http://127.0.0.1:8082/
+    ProxyPassReverse http://127.0.0.1:8082/
 </Location>
 
 EOF
@@ -362,7 +362,6 @@ case "$1" in
                check_user_and_db $MONITOR_DB_NAME $MONITOR_DB_USER
                # WRITE default /etc/monitor.conf
                check_monitor_conf
-               check_monitor_schema_and_data
 
                #check_pg_hba $ZABBIX_DB_NAME $ZABBIX_DB_USER
                #check_user_and_db $ZABBIX_DB_NAME $ZABBIX_DB_USER
@@ -375,6 +374,8 @@ case "$1" in
                        dialog "$MESSAGE"
                fi
 
+               check_monitor_schema_and_data
+
                #check_zabbix_schema_and_data
                #check_zabbix_templates_and_import
 

diff --git a/monitor/database/info/interface.py b/monitor/database/info/interface.py
index 29b19be..47c7553 100644 (file)
--- a/monitor/database/info/interface.py
+++ b/monitor/database/info/interface.py
@@ -1,4 +1,4 @@
-import bootman                 # debug nodes
+from monitor import bootman            # debug nodes
 
 from monitor import reboot
 from monitor.common import *

diff --git a/monitor/getsshkeys.py b/monitor/getsshkeys.py
index d362c94..1068c5f 100755 (executable)
--- a/monitor/getsshkeys.py
+++ b/monitor/getsshkeys.py
@@ -15,17 +15,17 @@ except:
        print traceback.print_exc()
        auth = {'AuthMethod' : "anonymous"}
 
-args = {}
-args['known_hosts'] =  os.environ['HOME'] + os.sep + ".ssh" + os.sep + "known_hosts"
-try:
-       from monitor import config
-       args['XMLRPC_SERVER'] = config.API_SERVER
-except:
-       args['XMLRPC_SERVER'] = 'https://boot.planet-lab.org/PLCAPI/'
-       print "Using default API server %s" %  args['XMLRPC_SERVER']
 
 class SSHKnownHosts:
-       def __init__(self, args = args):
+       def __init__(self, args = None):
+               if not args: args = {}
+               args['known_hosts'] =  os.environ['HOME'] + os.sep + ".ssh" + os.sep + "known_hosts"
+               try:
+                       from monitor import config
+                       args['XMLRPC_SERVER'] = config.API_SERVER
+               except:
+                       args['XMLRPC_SERVER'] = 'https://boot.planet-lab.org/PLCAPI/'
+                       print "Using default API server %s" %  args['XMLRPC_SERVER']
                self.args = args
                self.read_knownhosts()
                self.auth = auth

diff --git a/nodequery.py b/nodequery.py
index 1f41ceb..e9001a6 100755 (executable)
--- a/nodequery.py
+++ b/nodequery.py
@@ -413,12 +413,13 @@ def main():
                try:
                        # Find the most recent record
                        fb_noderec = FindbadNodeRecord.get_latest_by(hostname=node) 
+                       if not fb_noderec: continue
+                       fb_nodeinfo = fb_noderec.to_dict()
                except:
                        print traceback.print_exc()
-                       pass
+                       continue
 
                if config.listkeys:
-                       fb_nodeinfo = fb_noderec.to_dict()
                        print "Primary keys available in the findbad object:"
                        for key in fb_nodeinfo.keys():
                                print "\t",key
@@ -431,7 +432,6 @@ def main():
                        if config.daysdown:
                                daysdown_print_nodeinfo(fb_nodeinfo, node)
                        else:
-                               fb_nodeinfo = fb_noderec.to_dict()
                                if config.select:
                                        if config.fields:
                                                fields = config.fields.split(",")