Changeset 7

Timestamp:

10/02/2001 08:41:08 AM (7 years ago)

Author:

chris

Message:

Added the ability to receive and store multiple data points per RRD.
The store argument in the config must have comma-separated data names if there
are multiple data points to store at once. They must also match the DS names
created in the RRD file.

elvinrrd.cf has an example entry supporting multiple data points.

Location:

elvinrrd/trunk/elvinrrd

Files:

• elvinrrd.cf (modified) (1 diff)
• elvinrrd.py (modified) (2 diffs)

elvinrrd/trunk/elvinrrd/elvinrrd.cf

@@ -1 @@
-# Elvin RRD Name to match       RRD filename                            What Elvin variable to store
-#########################       #######################                 ############################
-elvinrrd=warrane-rad1.hay       rrdfile=/export/rrd/radiustiming/warrane-rad1.hay.rrd   store=timing
-elvinrrd=yarrina-rad1.hay       rrdfile=/export/rrd/radiustiming/yarrina-rad1.hay.rrd   store=timing
-elvinrrd=rexx-rad1.hay          rrdfile=/export/rrd/radiustiming/rexx-rad1.hay.rrd      store=timing
-elvinrrd=hakisak-rad1.hay       rrdfile=/export/rrd/radiustiming/hakisak-rad1.hay.rrd   store=timing
+# elvinrrd.cf - Config File for elvinrrd.py
+# $Id$
+# $Source$
+#
+# Elvin RRD Name to match       RRD filename                                    What Elvin variable(s) to store
+#########################       #######################                         ###############################
+#### Load Averages
+elvinrrd=loadavg1-crazy         rrdfile=/export/rrd/loadavg/loadavg1-crazy.rrd  store=loadavg1
+elvinrrd=loadavg5-crazy         rrdfile=/export/rrd/loadavg/loadavg5-crazy.rrd  store=loadavg5
+elvinrrd=loadavg15-crazy        rrdfile=/export/rrd/loadavg/loadavg15-crazy.rrd store=loadavg15
 
-elvinrrd=warrane-rad1.mel       rrdfile=/export/rrd/radiustiming/warrane-rad1.mel.rrd   store=timing
-elvinrrd=yarrina-rad1.mel       rrdfile=/export/rrd/radiustiming/yarrina-rad1.mel.rrd   store=timing
-elvinrrd=rexx-rad1.mel          rrdfile=/export/rrd/radiustiming/rexx-rad1.mel.rrd      store=timing
-elvinrrd=hakisak-rad1.mel       rrdfile=/export/rrd/radiustiming/hakisak-rad1.mel.rrd   store=timing
+elvinrrd=loadavg1-mental        rrdfile=/export/rrd/loadavg/loadavg1-mental.rrd store=loadavg1
+elvinrrd=loadavg5-mental        rrdfile=/export/rrd/loadavg/loadavg5-mental.rrd store=loadavg5
+elvinrrd=loadavg15-mental       rrdfile=/export/rrd/loadavg/loadavg15-mental.rrd store=loadavg15
 
-elvinrrd=hakisak-radentoo       rrdfile=/export/rrd/radiustiming/hakisak-radentoo.rrd   store=timing
+#### Scan Rates
+elvinrrd=sr-mental              rrdfile=/export/rrd/scanrate/sr-mental.rrd      store=scanrate
+
+#### CPU
+elvinrrd=cpu-crazy              rrdfile=/export/rrd/cpu/cpu-crazy.rrd           store=cpu_user,cpu_nice,cpu_system,cpu_idle

elvinrrd/trunk/elvinrrd/elvinrrd.py

@@ -22 +22 @@
 import elvin    # requires Elvin4 modules from http://elvin.dstc.edu.au/
 
-ELVIN_URL='elvin://elvin.connect.com.au'
+ELVIN_URL='elvin://elvin'
 ELVIN_SCOPE='elvin'
-RRD_DB = '/var/tmp/test.rrd'
 
 ################################################################
@@ -92 +91 @@
         try:
             r = self.rrddict[msg[u'ELVINRRD']]
-            val = msg[u'%s'%(r.store)]
-            u = (r.rrdfile, "N:%s" % (str(val)))
+            storelist = string.split( r.store, ',' )
+            if len(storelist) == 1:
+                # only one variable to store, use default method
+                val = msg[u'%s'%(r.store)]
+                u = (r.rrdfile, "N:%s" % (str(val)))
+            else:
+                # multiple variables to store - must name them
+                ds = "-t"
+                n = "N:"
+                for s in storelist:
+                    val = msg[u'%s'%(s)]
+                    ds = "%s%s:" % (ds,s)
+                    n = "%s%s:" % (n,str(val))
+
+                ds = ds[:-1]    # remove ':' from end
+                n = n[:-1]      # remove ':' from end
+                u = (r.rrdfile, ds, n)
+
             print ' rrd.update( %s )' % (u,)
             self.rrd.update( u )
 
-        except KeyError:
-            print "KeyError with message %s" % (msg)
+        except KeyError, err:
+            print "KeyError, %s, with message %s" % (err, msg)
 
-        except IOError:
-            print "IOError, cannot update rrd file for message %s" % (msg)
+        except IOError, err:
+            print "IOError, %s, cannot update rrd file for message %s" % (err, msg)