Merge pull request #32 from zenoss/feature/ZPS-8554.1

Revert the changes in develope branch
zenoss · Aug 30, 2023 · 771bf49 · 771bf49
2 parents d317b5b + 375d940
commit 771bf49
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 21 deletions.
diff --git a/ZenPacks/zenoss/PostgreSQL/__init__.py b/ZenPacks/zenoss/PostgreSQL/__init__.py
@@ -29,16 +29,8 @@ class ZenPack(ZenPackBase):
         ('zPostgreSQLPassword', '', 'password'),
         ('zPostgreSQLUseSSL', False, 'boolean'),
         ('zPostgreSQLDefaultDB', 'postgres', 'string'),
-        ('zPostgreSQLTableRegex', '', 'string'),
     ]
 
-    packZProperties_data = {
-        'zPostgreSQLTableRegex': {
-            'description': "Filter tables from all databases if name matches regex provided",
-            'label': "Regex Table Filter",
-            'type': "string" },
-    }
-
     def install(self, app):
         super(ZenPack, self).install(app)
         self.patchPostgreSQLDriver()

diff --git a/ZenPacks/zenoss/PostgreSQL/modeler/plugins/zenoss/PostgreSQL.py b/ZenPacks/zenoss/PostgreSQL/modeler/plugins/zenoss/PostgreSQL.py
@@ -12,7 +12,6 @@
 ###########################################################################
 
 import logging
-import re
 log = logging.getLogger('zen.PostgreSQL')
 
 from Products.DataCollector.plugins.CollectorPlugin import PythonPlugin
@@ -28,7 +27,6 @@ class PostgreSQL(PythonPlugin):
         'zPostgreSQLPassword',
         'zPostgreSQLUseSSL',
         'zPostgreSQLDefaultDB',
-        'zPostgreSQLTableRegex',
     )
 
     def collect(self, device, unused):
@@ -41,7 +39,6 @@ def collect(self, device, unused):
             device.zPostgreSQLDefaultDB)
 
         results = {}
-        pattern = re.compile(getattr(device, 'zPostgreSQLTableRegex', '').strip())
 
         log.info("Getting database list")
         try:
@@ -58,15 +55,7 @@ def collect(self, device, unused):
 
             log.info("Getting tables list for {0}".format(dbName))
             try:
-
-                tables = pg.getTablesInDatabase(dbName)
-                if pattern.pattern:
-                    for key in tables.keys():
-                        if not pattern.match(key):
-                            del tables[key]
-
-                results['databases'][dbName]['tables'] = tables    
-
+                results['databases'][dbName]['tables'] = pg.getTablesInDatabase(dbName)
             except Exception, ex:
                 log.warn("Error getting tables list for {0}: {1}".format(
                     dbName, ex))

diff --git a/docs/body.md b/docs/body.md
@@ -82,7 +82,6 @@ individual devices.
      - *zPostgreSQLUsername* - Must be a superuser. Default: postgres
      - *zPostgreSQLPassword* - Password for user. No default.
      - *zPostgreSQLDefaultDB* - Default database. Default: postgres
-     - *zPostgreSQLTableRegex* - Filter tables of all databases with Regex. Default: ""
 
 In addition to setting these properties you must add the ''zenoss.PostgreSQL''
 modeler plugin to a device class or individual device. This modeler plugin will