Merge remote branch 'taras/master'

ssOleg · Oct 15, 2013 · 01ed8b8 · 01ed8b8
2 parents 036e672 + dd4b70d
commit 01ed8b8
Show file tree

Hide file tree

Showing 3 changed files with 372 additions and 436 deletions.
diff --git a/ZenPacks/zenoss/MySqlMonitor/dsplugins.py b/ZenPacks/zenoss/MySqlMonitor/dsplugins.py
@@ -8,22 +8,6 @@
 
 from ZenPacks.zenoss.MySqlMonitor.utils import parse_mysql_connection_string
 
-class RandomPlugin(PythonDataSourcePlugin):
-    @defer.inlineCallbacks
-    def collect(self, config):
-        print '*' * 200
-        for ds in config.datasources:
-            yield
-
-    def onSuccess(self, result, config):
-        return {
-            'events': [],
-            'values': {
-                'localhost.localdomain': {
-                    'random': (2, time.time()),
-                    },
-                },
-            }
 
 class MySqlMonitorPlugin(PythonDataSourcePlugin):
     proxy_attributes = ('zMySQLConnectionString',)