Changeset 1434

Timestamp:

03/08/07 14:47:05 (6 years ago)

Author:

ckb6

Message:

Implement the ccsd side of the new graph and poller class options. This includes:

• Graph limits
• exist class upper and lower bounds

Location:

ccsd/trunk/crcnetd/modules

Files:

• ccs_graph.py (modified) (2 diffs)
• ccs_rrdbot.py (modified) (3 diffs)

ccsd/trunk/crcnetd/modules/ccs_graph.py

@@ -359 +359 @@
         
     # Build SQL
-    props = ["title", "class_id", "virtical_label"]
+    props = ["title", "class_id", "virtical_label", "auto_comment", "rigid", "upper"]
+    
+    nulls= []
+
+    if "upper" in newDetails and newDetails["upper"] == '':
+        nulls.append("upper")
 
     (sql, values) = buildUpdateFromDict("graph_type", props, newDetails, \
-            "graph_id", graph_id)
+            "graph_id", graph_id, False, nulls)
         
     if values == None:
@@ -393 +398 @@
     
     # Build query
-    props = ["title", "class_id", "group_id"]
-    (sql, values) = buildInsertFromDict("graph_type", props, clas)
+    props = ["title", "class_id", "group_id", "virtical_label", "auto_comment", "rigid", "upper"]
+    
+    nulls= []
+
+    if "upper" in clas and clas["upper"] == '':
+        nulls.append("upper")
+    (sql, values) = buildInsertFromDict("graph_type", props, clas, False, nulls)
     
     # Run query

ccsd/trunk/crcnetd/modules/ccs_rrdbot.py

@@ -203 +203 @@
     # Build query
     props = ["class_name", "poll", "interval", \
-            "cf", "archive", "depends"]
-    (sql, values) = buildInsertFromDict("rrdbot_class", props, clas)
+            "cf", "archive", "depends", "upper_bound", "lower_bound"]
+   
+    nulls= []
+
+    if "lower_bound" in clas and clas["lower_bound"] == '':
+        nulls.append("lower_bound")
+    if "upper_bound" in clas and clas["upper_bound"] == '':
+        nulls.append("upper_bound")            
+    (sql, values) = buildInsertFromDict("rrdbot_class", props, clas, False, nulls)
     
     # Run query
@@ -265 +272 @@
     # Build SQL
     props = ["class_id", "class_name", "poll", "interval", \
-        "cf", "archive", "depends"]
+        "cf", "archive", "depends", "upper_bound", "lower_bound"]
+
+
+    nulls= []
+
+    if "lower_bound" in newDetails and newDetails["lower_bound"] == '':
+        nulls.append("lower_bound")
+    if "upper_bound" in newDetails and newDetails["upper_bound"] == '':
+        nulls.append("upper_bound")            
     (sql, values) = buildUpdateFromDict("rrdbot_class", props, newDetails, \
-            "class_id", class_id)
+            "class_id", class_id, False, nulls)
         
     if values == None:
@@ -459 +474 @@
 
         variables['classes'] = classes
-
+        print classes
         variables["graphport"] = config_get("graphs", "port", "80")
         return variables