Changeset 198 for trunk/daemon

Timestamp:

09/21/05 16:29:10 (18 years ago)

Author:

bastiaans

Message:

daemon/jobarchived.py:

• Now with support for ARCHIVE_EXCLUDE_METRICS ! List of metric names (string or regexp) not to archive

File:

• trunk/daemon/jobarchived.py (modified) (3 diffs)

trunk/daemon/jobarchived.py

@@ -13 +13 @@
 import threading
 import random
+import re
 from types import *
 import DBClass
@@ -71 +72 @@
 #
 ARCHIVE_HOURS_PER_RRD = 12
+
+# Which metrics to exclude from archiving
+# NOTE: This can be a regexp or a string
+#
+ARCHIVE_EXCLUDE_METRICS = [ "^Temp_.*_.*", ".*_Temp_.*", ".*_RPM_.*", ".*_Battery_.*" ]
 
 # Toga's SQL dbase to use
@@ -645 +651 @@
 
                         type = attrs.get( 'TYPE', "" )
-
-                        if type not in UNSUPPORTED_ARCHIVE_TYPES:
+                        
+                        exclude_metric = False
+                        
+                        for ex_metricstr in ARCHIVE_EXCLUDE_METRICS:
+
+                                orig_name = attrs.get( 'NAME', "" )     
+
+                                if string.lower( orig_name ) == string.lower( ex_metricstr ):
+                                
+                                        exclude_metric = True
+
+                                elif re.match( ex_metricstr, orig_name ):
+
+                                        exclude_metric = True
+
+                        if type not in UNSUPPORTED_ARCHIVE_TYPES and not exclude_metric:
 
                                 myMetric = { }