Index: /ccsd/trunk/dbschema/ccs_graphs.exampledata
===================================================================
--- /ccsd/trunk/dbschema/ccs_graphs.exampledata	(revision 1282)
+++ /ccsd/trunk/dbschema/ccs_graphs.exampledata	(revision 1283)
@@ -7,7 +7,7 @@
 
 -- rrdbot Classes
-INSERT INTO rrdbot_class VALUES (DEFAULT, 'interface', 'ifNumber:count', 300, 'AVERAGE', '12/hour * 2 days, 1/hour * 1 month, 12/day * 1 year', 0);
-INSERT INTO rrdbot_class VALUES (DEFAULT, 'wireless', 'lsIndex', 300, 'AVERAGE', '12/hour * 2 days, 1/hour * 1 month, 12/day * 1 year', 1);
-INSERT INTO rrdbot_class VALUES (DEFAULT, 'solar', 'battVoltage:exist', 300, 'AVERAGE', '12/hour * 2 days, 1/hour * 1 month, 12/day * 1 year', 0);
+INSERT INTO rrdbot_class VALUES (DEFAULT, 'interface', 'ipAdEntIfIndex:walk', 300, 'AVERAGE', '12/hour * 2 days, 2/hour * 2 weeks, 12/day * 10 weeks, 1/day * 800 days', 0, 1, 1,'ifDescr');
+INSERT INTO rrdbot_class VALUES (DEFAULT, 'wireless', 'lsIndex', 300, 'AVERAGE', '12/hour * 2 days, 2/hour * 2 weeks, 12/day * 10 weeks, 1/day * 800 days', 1, 0, 0, '');
+INSERT INTO rrdbot_class VALUES (DEFAULT, 'solar', 'battVoltage:exist', 300, 'AVERAGE', '12/hour * 2 days, 2/hour * 2 weeks, 12/day * 10 weeks, 1/day * 800 days', 0, 0, 0, '');
 
 INSERT INTO rrdbot_class_parts VALUES (DEFAULT, 1,'ifInOctets','ifInOctets','COUNTER',0,NULL);
@@ -42,9 +42,15 @@
 INSERT INTO graph_group VALUES (DEFAULT, 'Traffic');
 INSERT INTO graph_group VALUES (DEFAULT, 'Solar');
-INSERT INTO graph_group VALUES (DEFAULT, 'SNR');
+INSERT INTO graph_group VALUES (DEFAULT, 'Signal to Noise Ratio');
+INSERT INTO graph_group VALUES (DEFAULT, 'Signal / Noise Levels');
 
-INSERT INTO graph_type VALUES (DEFAULT, 1, 1, 'ifOctets', 'interface','Bits per second');
-INSERT INTO graph_type VALUES (DEFAULT, 1, 1, 'ifErrors', 'interface','Bits per second');
-INSERT INTO graph_type VALUES (DEFAULT, 2, 3, 'Voltage', 'solar','Bits per second');
+INSERT INTO graph_type VALUES (DEFAULT, 1, 1, 'Traffic Rate', 'interface','Bits per second');
+INSERT INTO graph_type VALUES (DEFAULT, 1, 1, 'Error Rate', 'interface','Bits per second');
+INSERT INTO graph_type VALUES (DEFAULT, 2, 3, 'Battery Voltage', 'solar','Voltage');
+INSERT INTO graph_type VALUES (DEFAULT, 2, 3, 'Array Voltage', 'solar','Voltage');
+INSERT INTO graph_type VALUES (DEFAULT, 2, 3, 'Current', 'solar','Amps');
+INSERT INTO graph_type VALUES (DEFAULT, 2, 3, 'Temperature', 'solar','Deg. Celcius');
+INSERT INTO graph_type VALUES (DEFAULT, 3, 2, 'Signal to Noise Ratio', 'wireless','SNR');
+INSERT INTO graph_type VALUES (DEFAULT, 4, 2, 'Signal / Noise', 'wireless','-dbM');
 
 INSERT INTO graph_parts VALUES (DEFAULT, 1, 1, 'DEF', 0, 'ifInOctets','val1', 'AVERAGE');
@@ -52,11 +58,11 @@
 INSERT INTO graph_parts VALUES (DEFAULT, 1, 2, 'CDEF', 0, 'val1,8,*','cval1', '');
 INSERT INTO graph_parts VALUES (DEFAULT, 1, 2, 'CDEF', 0, 'val2,8,*','cval2', '');
-INSERT INTO graph_parts VALUES (DEFAULT, 1, 3, 'LINE2', '0000FF', 'ifInOctets', 'cval1', '');
-INSERT INTO graph_parts VALUES (DEFAULT, 1, 4, 'LINE2', 'FF0000', 'ifOutOctets', 'cval2', '');
+INSERT INTO graph_parts VALUES (DEFAULT, 1, 3, 'AREA', '00FF00', 'ifInOctets', 'cval1', '');
+INSERT INTO graph_parts VALUES (DEFAULT, 1, 4, 'LINE2', '0000FF', 'ifOutOctets', 'cval2', '');
 
 INSERT INTO graph_parts VALUES (DEFAULT, 2, 1, 'DEF', 0, 'ifInErrors','val1', 'AVERAGE');
 INSERT INTO graph_parts VALUES (DEFAULT, 2, 1, 'DEF', 0, 'ifOutErrors','val2', 'AVERAGE');
-INSERT INTO graph_parts VALUES (DEFAULT, 2, 3, 'LINE2', '0000FF', 'Errors In', 'val1', '');
-INSERT INTO graph_parts VALUES (DEFAULT, 2, 4, 'LINE2', 'FF0000', 'Errors out', 'val2', '');
+INSERT INTO graph_parts VALUES (DEFAULT, 2, 3, 'AREA', '00FF00', 'Errors In', 'val1', '');
+INSERT INTO graph_parts VALUES (DEFAULT, 2, 4, 'LINE2', '0000FF', 'Errors out', 'val2', '');
 
 INSERT INTO graph_parts VALUES (DEFAULT, 3, 1, 'DEF', 0, 'battVoltage','val1', 'AVERAGE');
@@ -64,12 +70,37 @@
 INSERT INTO graph_parts VALUES (DEFAULT, 3, 2, 'CDEF', 0, 'val1,1000,/','cval1', '');
 INSERT INTO graph_parts VALUES (DEFAULT, 3, 2, 'CDEF', 0, 'val2,1000,/','cval2', '');
-INSERT INTO graph_parts VALUES (DEFAULT, 3, 3, 'AREA', '0000FF', 'Batt Voltage', 'cval1', '');
-INSERT INTO graph_parts VALUES (DEFAULT, 3, 4, 'LINE2', 'FF0000', 'Sense Voltage', 'cval2', '');
+INSERT INTO graph_parts VALUES (DEFAULT, 3, 3, 'AREA', '00FF00', 'Batt Voltage', 'cval1', '');
+INSERT INTO graph_parts VALUES (DEFAULT, 3, 4, 'LINE2', '0000FF', 'Sense Voltage', 'cval2', '');
 
-INSERT INTO graph_time VALUES ( DEFAULT, '-1h', 'now', 'Hour');
-INSERT INTO graph_time VALUES ( DEFAULT, '-1d', 'now', 'Day');
-INSERT INTO graph_time VALUES ( DEFAULT, '-1m', 'now', 'Month');
-INSERT INTO graph_time VALUES ( DEFAULT, '-1y', 'now', 'Year');
+INSERT INTO graph_parts VALUES (DEFAULT, 4, 1, 'DEF', 0, 'arrayVoltage','val1', 'AVERAGE');
+INSERT INTO graph_parts VALUES (DEFAULT, 4, 1, 'DEF', 0, 'refVoltage','val2', 'AVERAGE');
+INSERT INTO graph_parts VALUES (DEFAULT, 4, 2, 'CDEF', 0, 'val1,1000,/','cval1', '');
+INSERT INTO graph_parts VALUES (DEFAULT, 4, 2, 'CDEF', 0, 'val2,1000,/','cval2', '');
+INSERT INTO graph_parts VALUES (DEFAULT, 4, 3, 'AREA', '00FF00', 'Array Voltage', 'cval1', '');
+INSERT INTO graph_parts VALUES (DEFAULT, 4, 4, 'LINE2', '0000FF', 'Reference Voltage', 'cval2', '');
 
-INSERT INTO snmp_state VALUES ( 0);
+INSERT INTO graph_parts VALUES (DEFAULT, 5, 1, 'DEF', 0, 'loadCurrent','val1', 'AVERAGE');
+INSERT INTO graph_parts VALUES (DEFAULT, 5, 1, 'DEF', 0, 'chargeCurrent','val2', 'AVERAGE');
+INSERT INTO graph_parts VALUES (DEFAULT, 5, 2, 'CDEF', 0, 'val1,1000,/','cval1', '');
+INSERT INTO graph_parts VALUES (DEFAULT, 5, 2, 'CDEF', 0, 'val2,1000,/','cval2', '');
+INSERT INTO graph_parts VALUES (DEFAULT, 5, 3, 'AREA', '00FF00', 'Load Current', 'cval1', '');
+INSERT INTO graph_parts VALUES (DEFAULT, 5, 4, 'LINE2', '0000FF', 'Charge Current', 'cval2', '');
+
+INSERT INTO graph_parts VALUES (DEFAULT, 6, 1, 'DEF', 0, 'hstemp','val1', 'AVERAGE');
+INSERT INTO graph_parts VALUES (DEFAULT, 6, 1, 'DEF', 0, 'battemp','val2', 'AVERAGE');
+INSERT INTO graph_parts VALUES (DEFAULT, 6, 2, 'AREA', '00FF00', 'Heatsink Temp', 'val1', '');
+INSERT INTO graph_parts VALUES (DEFAULT, 6, 3, 'LINE2', '0000FF', 'Battery Temp', 'val2', '');
+
+INSERT INTO graph_parts VALUES (DEFAULT, 7, 1, 'DEF', 0, 'linkCurrentSignal','val1', 'AVERAGE');
+INSERT INTO graph_parts VALUES (DEFAULT, 7, 1, 'DEF', 0, 'linkCurrentNoise','val2', 'AVERAGE');
+INSERT INTO graph_parts VALUES (DEFAULT, 7, 2, 'CDEF', 0, 'val1,val2,-','snr', '');
+INSERT INTO graph_parts VALUES (DEFAULT, 7, 3, 'LINE2', '00FF00', 'SNR', 'snr', '');
+
+INSERT INTO graph_parts VALUES (DEFAULT, 8, 1, 'DEF', 0, 'linkCurrentSignal','val1', 'AVERAGE');
+INSERT INTO graph_parts VALUES (DEFAULT, 8, 1, 'DEF', 0, 'linkCurrentNoise','val2', 'AVERAGE');
+INSERT INTO graph_parts VALUES (DEFAULT, 8, 2, 'CDEF', 0, 'val1,1000,/,-1,*','cval1', '');
+INSERT INTO graph_parts VALUES (DEFAULT, 8, 2, 'CDEF', 0, 'val2,1000,/,-1,*','cval2', '');
+INSERT INTO graph_parts VALUES (DEFAULT, 8, 3, 'AREA', '00FF00', 'Signal', 'cval1', '');
+INSERT INTO graph_parts VALUES (DEFAULT, 8, 4, 'LINE2', '0000FF', 'Noise', 'cval2', '');
+
 -- vim: ft=sql
Index: /ccsd/trunk/dbschema/ccs_graphs.schema
===================================================================
--- /ccsd/trunk/dbschema/ccs_graphs.schema	(revision 1282)
+++ /ccsd/trunk/dbschema/ccs_graphs.schema	(revision 1283)
@@ -17,5 +17,8 @@
     cf          varchar(8),
     archive     varchar(256),
-    depends     integer         DEFAULT 0
+    depends     integer         DEFAULT 0,
+    ipfromoid   integer,
+    skip_software_loop  integer,
+    key         varchar(64)
 );
 
@@ -100,3 +103,20 @@
 
 create view rrdbotlog as select a.host_id, a.class_id, c.class_name, b.host_name, a.num, a.ip_address, a.timestamp, a.link_id, d.description from snmp_discovery a LEFT JOIN link d on a.link_id=d.link_id, host b, rrdbot_class c where b.host_id=a.host_id and c.class_id=a.class_id;
+
+-- Required values for graphs
+INSERT INTO graph_time VALUES ( DEFAULT, '-1h', 'now', 'Hour');
+INSERT INTO graph_time VALUES ( DEFAULT, '-1d', 'now', 'Day');
+INSERT INTO graph_time VALUES ( DEFAULT, '-1w', 'now', 'Week');
+INSERT INTO graph_time VALUES ( DEFAULT, '-1m', 'now', 'Month');
+INSERT INTO graph_time VALUES ( DEFAULT, '-1y', 'now', 'Year');
+
+INSERT INTO graph_time VALUES ( DEFAULT, '-2h', '-1h', 'Last Hour');
+INSERT INTO graph_time VALUES ( DEFAULT, '-2d', '-1d', 'Yesturday');
+INSERT INTO graph_time VALUES ( DEFAULT, '-2w', '-1w', 'Last Week');
+INSERT INTO graph_time VALUES ( DEFAULT, '-2m', '-1m', 'Last Month');
+INSERT INTO graph_time VALUES ( DEFAULT, '-2y', '-1y', 'Last Year');
+
+
+-- Set the initial state
+INSERT INTO snmp_state VALUES ( 0);
 -- vim: ft=sql