fix: merged invalid indexes metrics

Author: cuprumtan

mamonsu/plugins/pgsql/databases.py

@@ -20,8 +20,7 @@ class Databases(Plugin):
     query_invalid_indexes = "SELECT count(*) " \
                             "FROM pg_catalog.pg_class, pg_catalog.pg_index " \
                             "WHERE pg_catalog.pg_index.indisvalid = false " \
-                            "AND pg_catalog.pg_index.indexrelid = pg_catalog.pg_class.oid " \
-                            "AND substring(pg_catalog.pg_class.relname, '([^_]+$)') ~ '^cc{0}';"
+                            "AND pg_catalog.pg_index.indexrelid = pg_catalog.pg_class.oid;" \
 
     # queries for zabbix agent
     query_agent_discovery = "SELECT json_build_object ('data',json_agg(json_build_object('{#DATABASE}',d.datname)))" \
@@ -32,8 +31,7 @@ class Databases(Plugin):
     key_db_age = "pgsql.database.max_age{0}"
     key_db_bloating_tables = "pgsql.database.bloating_tables{0}"
     key_autovacumm = "pgsql.autovacumm.count{0}"
-    key_invalid_rebuilt_indexes = "pgsql.database.invalid_rebuilt_indexes{0}"
-    key_invalid_old_indexes = "pgsql.database.invalid_old_indexes{0}"
+    key_invalid_indexes = "pgsql.database.invalid_indexes{0}"
 
     DEFAULT_CONFIG = {'min_rows': str(50), 'bloat_scale': str(0.2)}
 
@@ -59,20 +57,14 @@ def run(self, zbx):
             zbx.send(
                 'pgsql.database.bloating_tables[{0}]'.format(info[0]),
                 int(bloat_count))
-            invalid_rebuilt_indexes_count = Pooler.query(
-                self.query_invalid_indexes.format('new'),
+            invalid_indexes_count = Pooler.query(
+                self.query_invalid_indexes,
                 info[0])[0][0]
-            invalid_old_indexes_count = Pooler.query(
-                self.query_invalid_indexes.format('old'),
-                info[0])[0][0]
-            zbx.send(
-                'pgsql.database.invalid_rebuilt_indexes[{0}]'.format(info[0]),
-                int(invalid_rebuilt_indexes_count))
             zbx.send(
-                'pgsql.database.invalid_old_indexes[{0}]'.format(info[0]),
-                int(invalid_old_indexes_count))
+                'pgsql.database.invalid_indexes[{0}]'.format(info[0]),
+                int(invalid_indexes_count))
         zbx.send('pgsql.database.discovery[]', zbx.json({'data': dbs}))
-        del dbs, bloat_count
+        del dbs, bloat_count, invalid_indexes_count
 
         result = Pooler.run_sql_type('count_autovacuum')
         zbx.send('pgsql.autovacumm.count[]', int(result[0][0]))
@@ -123,11 +115,8 @@ def discovery_rules(self, template, dashboard=False):
             {'key': self.right_type(self.key_db_bloating_tables, var_discovery="{#DATABASE},"),
              'name': 'Count of bloating tables in database: {#DATABASE}',
              'delay': self.plugin_config('interval')},
-            {'key': self.right_type(self.key_invalid_rebuilt_indexes, var_discovery="{#DATABASE},"),
-             'name': 'Count of indexes corrupted during REINDEX in database: {#DATABASE}',
-             'delay': self.plugin_config('interval')},
-            {'key': self.right_type(self.key_invalid_old_indexes, var_discovery="{#DATABASE},"),
-             'name': 'Count of old invalid indexes in database: {#DATABASE}',
+            {'key': self.right_type(self.key_invalid_indexes, var_discovery="{#DATABASE},"),
+             'name': 'Count of invalid indexes in database: {#DATABASE}',
              'delay': self.plugin_config('interval')}
         ]
         graphs = [
@@ -158,13 +147,9 @@ def discovery_rules(self, template, dashboard=False):
             }
         ]
         triggers = [{
-            'name': 'PostgreSQL indexes corrupted during REINDEX in database '
+            'name': 'PostgreSQL invalid indexes in database '
                     '{#DATABASE} (hostname={HOSTNAME} value={ITEM.LASTVALUE})',
-            'expression': '{#TEMPLATE:pgsql.database.invalid_rebuilt_indexes[{#DATABASE}].last()}>0'},
-            {
-                'name': 'PostgreSQL old invalid indexes in database '
-                        '{#DATABASE} (hostname={HOSTNAME} value={ITEM.LASTVALUE})',
-                'expression': '{#TEMPLATE:pgsql.database.invalid_old_indexes[{#DATABASE}].last()}>0'}
+            'expression': '{#TEMPLATE:pgsql.database.invalid_indexes[{#DATABASE}].last()}>0'}
         ]
         return template.discovery_rule(rule=rule, conditions=conditions, items=items, graphs=graphs, triggers=triggers)
 
@@ -179,8 +164,6 @@ def keys_and_queries(self, template_zabbix):
                                                       self.query_bloating_tables.format(
                                                           self.plugin_config('bloat_scale'),
                                                           self.plugin_config('min_rows'))),
-                  '{0},$3 $2 -d "$1" -c "{1}"'.format(self.key_invalid_rebuilt_indexes.format("[*]"),
-                                                      self.query_invalid_indexes.format('new')),
-                  '{0},$3 $2 -d "$1" -c "{1}"'.format(self.key_invalid_old_indexes.format("[*]"),
-                                                      self.query_invalid_indexes.format('old'))]
+                  '{0},$3 $2 -d "$1" -c "{1}"'.format(self.key_invalid_indexes.format("[*]"),
+                                                      self.query_invalid_indexes)]
         return template_zabbix.key_and_query(result)