show errors description by modeling, update only useful threshold

alienth · Oct 26, 2011 · a25f635 · a25f635
1 parent 0d6d828
commit a25f635
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/ZenPacks/community/SQLDataSource/SQLPlugin.py b/ZenPacks/community/SQLDataSource/SQLPlugin.py
@@ -12,9 +12,9 @@
 
 wrapper for PythonPlugin
 
-$Id: SQLPlugin.py,v 2.4 2011/10/25 16:23:10 egor Exp $"""
+$Id: SQLPlugin.py,v 2.5 2011/10/26 19:41:01 egor Exp $"""
 
-__version__ = "$Revision: 2.4 $"[11:-2]
+__version__ = "$Revision: 2.5 $"[11:-2]
 
 from Products.DataCollector.plugins.CollectorPlugin import CollectorPlugin
 from twisted.python.failure import Failure
@@ -44,8 +44,8 @@ def collect(self, device, log):
             cl.close()
             cl = None
             return results
-        except:
-            log.error("Error opening sql client")
+        except Exception, ex:
+            log.error("Error: %s", ex)
 
     def preprocess(self, results, log):
         newres = {}

diff --git a/ZenPacks/community/SQLDataSource/services/SqlPerfConfig.py b/ZenPacks/community/SQLDataSource/services/SqlPerfConfig.py
@@ -12,9 +12,9 @@
 
 Provides config to zenperfsql clients.
 
-$Id: SqlPerfConfig.py,v 2.4 2011/10/25 16:28:35 egor Exp $"""
+$Id: SqlPerfConfig.py,v 2.5 2011/10/26 20:26:18 egor Exp $"""
 
-__version__ = "$Revision: 2.4 $"[11:-2]
+__version__ = "$Revision: 2.5 $"[11:-2]
 
 from Products.ZenCollector.services.config import CollectorConfigService
 from Products.ZenUtils.ZenTales import talesEval
@@ -47,6 +47,7 @@ def _createDeviceProxy(self, device):
             try: basepath = comp.rrdPath()
             except: continue
             for templ in comp.getRRDTemplates():
+                dpnames = []
                 for ds in templ.getRRDDataSources():
                     if not (isinstance(ds, DataSource) and ds.enabled):continue
                     sql, sqlp, kbs, cs = ds.getQueryInfo(comp)
@@ -56,6 +57,7 @@ def _createDeviceProxy(self, device):
                     columns = {}
                     for dp in ds.getRRDDataPoints():
                         dpname = dp.name()
+                        dpnames.append(dpname)
                         alias = (dp.aliases() or [dp])[0]
                         aname = alias.id.strip().upper()
                         if hasattr(alias, 'formula'):
@@ -73,7 +75,7 @@ def _createDeviceProxy(self, device):
                                 (dp.rrdmin, dp.rrdmax)))
                     queries[tn] = (sqlp, kbs, cs, columns, sql)
 
-                dpn = set(templ.getRRDDataPointNames())
+                dpn = set(dpnames)
                 for thr in templ.thresholds():
                     if not (thr.enabled and dpn & set(thr.dsnames)): continue
                     proxy.thresholds.append(thr.createThresholdInstance(comp))

diff --git a/setup.py b/setup.py
@@ -3,7 +3,7 @@
 # or saved.  Do not modify them directly here.
 # NB: PACKAGES is deprecated
 NAME = "ZenPacks.community.SQLDataSource"
-VERSION = "1.98"
+VERSION = "1.99"
 AUTHOR = "Egor Puzanov"
 LICENSE = ""
 NAMESPACE_PACKAGES = ['ZenPacks', 'ZenPacks.community']