[gentoo-commits] proj/R_overlay:master commit in: roverlay/db/

["André Erdmann" <dywi@mailerd.de>]

commit:     dee7555a9e0f9cfa59c4fbad3e7d9a50f0192a9a
Author:     André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Tue Aug 13 12:05:12 2013 +0000
Commit:     André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Tue Aug 13 12:05:12 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=dee7555a

roverlay/db/rrdtool: convert values when importing

---
 roverlay/db/rrdtool.py | 28 +++++++++++++++++++++++-----
 1 file changed, 23 insertions(+), 5 deletions(-)

diff --git a/roverlay/db/rrdtool.py b/roverlay/db/rrdtool.py
index e21f592..76bded7 100644
--- a/roverlay/db/rrdtool.py
+++ b/roverlay/db/rrdtool.py
@@ -245,6 +245,20 @@ class RRD ( object ):
    # --- end of commit (...) ---
 
    def make_cache ( self, mask=-1, clear_cache=False ):
+      def convert_value ( str_value, value_type ):
+         try:
+            if value_type == 'GAUGE':
+               ret = float ( str_value )
+            elif value_type in { 'COUNTER', 'DERIVE', 'ABSOLUTE' }:
+               ret = int ( str_value )
+            else:
+               ret = str_value
+         except ValueError:
+            return str_value
+         else:
+            return ret
+      # --- end of convert_value (...) ---
+
       if clear_cache or not self.cache:
          self.cache = dict()
 
@@ -255,12 +269,16 @@ class RRD ( object ):
       eroot = xml.etree.ElementTree.fromstring ( '\n'.join ( xml_dump ) )
 
       self.cache ['lastupdate'] = eroot.find ( "./lastupdate" ).text.strip()
-      self.cache ['values'] = {
-         node.find ( "name" ).text.strip():
-               node.find ( "last_ds" ).text.strip()
-         for node in eroot.findall ( "./ds" )
-      }
 
+      self.cache ['values'] = dict()
+      for ds_node in eroot.findall ( "./ds" ):
+         ds_name = ds_node.find ( "name" ).text.strip()
+         ds_type = ds_node.find ( "type" ).text.strip()
+         if ds_type != 'COMPUTE':
+            ds_value = ds_node.find ( "last_ds" ).text.strip()
+            self.cache ['values'] [ds_name] = convert_value (
+               ds_value, ds_type
+            )
 
       return True
    # --- end of make_cache (...) ---