Changeset 1284

Timestamp:

01/12/07 17:12:47 (6 years ago)

Author:

ckb6

Message:

The graphs server location is now automatic, rrdbot certs auto generated, now a per host service, smarter state locking for rrdbot-script, and general release work

Location:

ccsd/trunk/crcnetd/modules

Files:

• ccs_graph.py (modified) (6 diffs)
• ccs_rrdbot.py (modified) (11 diffs)

ccsd/trunk/crcnetd/modules/ccs_graph.py

@@ -25 +25 @@
 from crcnetd._utils.ccsd_session import getSession, getSessionE
 from crcnetd._utils.ccsd_server import exportViaXMLRPC
-from crcnetd._utils.ccsd_service import ccsd_service, ccs_service_error, \
-        registerService
-
+from crcnetd._utils.ccsd_service import getServiceInstance
 ccs_mod_type = CCSD_SERVER
+GRAPH_SERVER = "localhost:80"
 
 @exportViaXMLRPC(SESSION_RO, AUTH_USER)
@@ -134 +133 @@
 @exportViaXMLRPC(SESSION_RO, AUTH_USER)
 def getGraphs(session_id, host_id=-1, group_id=-1, mirror='f'):
+    global GRAPH_SERVER
     '''This returns data to draw graphs'''
     
@@ -183 +183 @@
         graphs2.append(newgraph)    
         
-    return graphs2
+    return GRAPH_SERVER, graphs2
 
 @exportViaXMLRPC(SESSION_RO, AUTH_USER)
@@ -223 +223 @@
     if host_id == '' and len(hostList2) > 0:
         host_id = hostList2[0]["host_id"]
+    elif host_id == '':
+        host_id = 0
 
     linkGraphs = getLinkGraphs(session_id)
@@ -238 +240 @@
         newgraph ["group_name"] = graph["group_name"]
         hostGraphs2.append(newgraph)    
-    graphs = getGraphs(session_id)
+    server, graphs = getGraphs(session_id)
     times = getTimes(session_id)
     pack = [hostList2, linkGraphs2, hostGraphs2, graphs, times]
@@ -429 +431 @@
     res = session.execute(sql, (group_id))
     return 1    
+
+def ccs_init():
+    global GRAPH_SERVER
+    GRAPH_SERVER = "%s:%s" % (config_get("graphs", "host", "localhost"), \
+        config_get("graphs", "port", "80"))
+

ccsd/trunk/crcnetd/modules/ccs_rrdbot.py

@@ -26 +26 @@
 from crcnetd._utils.ccsd_server import exportViaXMLRPC
 from crcnetd._utils.ccsd_service import ccsd_service, ccs_service_error, \
-        registerService
-
+        registerService, getServiceInstance
+from crcnetd._utils.ccsd_cfengine import ccs_revision
+from crcnetd._utils.ccsd_ca import *
+import os.path
 import time
+import shutil
 
 ccs_mod_type = CCSD_SERVER
 
+class rrdbot_error(ccs_service_error):
+    pass
+    
 @exportViaXMLRPC(SESSION_RW, AUTH_USER)
 def snmp_found(session_id, hostname, classname, number, data=''):
@@ -63 +69 @@
     return 1
 
+@catchEvent("interfaceAdded")
+def interfaceAdded(eventName, host_id, session_id, **params):
+    addSnmpInstruction(session_id, host_id, 3, None, None, None)
+
 @exportViaXMLRPC(SESSION_RW, AUTH_USER)
 def addSnmpInstruction(session_id, host_id, instr, param1=None, param2=None, param3=None):
@@ -89 +99 @@
 def setSnmpState(session_id,state):
     '''Set the current state of rrdbot-script'''
-
-    session = getSessionE(session_id)
-    sql = "UPDATE snmp_state SET state=%s"
-    res = session.execute(sql, (state))
-    if res and res[0][0] == 0:
-        return round(300-(time.time()%300))
+    lock = True
+    session = getSessionE(session_id)
+
+    #If wanting to lock see if its already locked
+    if state == 1:
+        sql = "SELECT state FROM snmp_state"
+        res = session.query(sql, ())
+        if res and res[0][0] != 0:
+            lock = False
+    if lock:
+        sql = "UPDATE snmp_state SET state=%s"
+        res = session.execute(sql, (state))
+        return 0
     else:
-        return 0    
+        return 1
         
 @exportViaXMLRPC(SESSION_RO, AUTH_USER)
@@ -168 +185 @@
         sql = "UPDATE rrdbot_class SET depends=0, poll=\'%s%s\' WHERE class_id=%%s" % (clas["poll"], ":exist")
         res2 = session.execute(sql, (clas["class_id"]))
-        print sql
-        print clas["class_id"]
     
     # Delete the class and its class parts
@@ -323 +338 @@
     return 1
     
+
+@catchEvent("revisionPrepared")
+def handleRevisionPrepEvent(eventName, host_id, session_id, outputDir):
+    """Receives callbacks to add extra information to the config revisions"""
+    
+    # Get a list of hosts running the rrdbot service
+    rrdbot = getServiceInstance(session_id, ccs_rrdbot.serviceName)
+    hosts = rrdbot.getHostList()
+
+    ca = ccs_ca()
+
+    # Loop through each host and ensure that the certs/ directory is populated
+    for host in hosts:
+        try:
+            # Check basic path existance
+            hostdir = "%s/hosts/%s" % (outputDir, host)
+            if not os.path.isdir(hostdir):
+                # Host does not exist in the revision
+                continue
+            rrdbotdir = "%s/rrdbot" % (hostdir)
+            if not os.path.isdir(rrdbotdir):
+                log_warn("Host '%s' does not have rrdbot templates!" % host)
+                continue
+            # Now check for the certs directory and the certificates
+            certsdir = "%s/certs" % (rrdbotdir)
+            ensureDirExists(certsdir)
+            if not os.path.exists("%s/key.pem" % certsdir):
+                key = ca.getFile("ca/rrdbot-key.pem")
+                fp = open("%s/key.pem" % certsdir, "w")
+                fp.write(key)
+                fp.close()
+            if not os.path.exists("%s/cert.pem" % certsdir):
+                cert = ca.getFile("ca/rrdbot-cert.pem")
+                fp = open("%s/cert.pem" % certsdir, "w")
+                fp.write(cert)
+                fp.close()
+        except:
+            log_error("Could not setup rrdbot certificates for %s" % host, \
+                    sys.exc_info())
+    
 class ccs_rrdbot(ccsd_service):
 
@@ -331 +386 @@
         # Call base class setup
         ccsd_service.__init__(self, session_id, service_id)
-
 
     def getNetworkTemplateVariables(self):
@@ -356 +410 @@
                 classes[clas["class_id"]]["subs"] = []
 
-
         variables['classes'] = classes
+
+        # Include a list of hosts that the service is enabled on
+        variables["hosts"] = self.getEnabledHostList()
+        variables["server"] = config_get_required("network", "server_name")
+        variables["port"] = config_get("ccsd", "port", DEFAULT_SERVER_PORT)
+        variables["graphport"] = config_get("graphs", "port", "80")
         return variables
-        
+
+            
+            
     @staticmethod
     def initialiseService():
@@ -370 +431 @@
         session.begin("initialising rrdbot service")        
         try:
+            
 
             session.execute("INSERT INTO service (service_id, service_name, " \
@@ -376 +438 @@
             service_id = session.getCountOf("SELECT currval('" \
                     "service_service_id_seq') AS server_id", ())
+                    
+            # Read in schema and dump into database
+            fp = open("%s/ccs_graphs.schema" % \
+                    config_get("ccsd", "service_data_dir", \
+                    DEFAULT_SERVICE_DATA_DIR))
+            schema = fp.readlines()
+            fp.close()
+            session.execute("\n".join(schema), ())
 
             # Commit the changeset
@@ -385 +455 @@
             log_error("Unable to initialise rrdbot database entries!", \
                     sys.exc_info())
-            raise quagga_error("Failed to setup database tables!")
+            raise rrdbot_error("Failed to setup database tables!")
 
         return service_id
@@ -392 +462 @@
 def ccs_init():
     registerService(ccs_rrdbot)
+    #Ensure Certificates exist
+    ca = ccs_ca()
+    ca.ensureCertificateExists("rrdbot")
+    #Ensure state is set to 0
+    session = getSessionE(ADMIN_SESSION_ID)
+    sql = "UPDATE snmp_state SET state=0"
+    session.execute(sql, ())