Merge branch 'dev'

Author: cuprumtan

documentation/metrics.md

@@ -2553,30 +2553,35 @@ Default config:
         <td>Count of bloating tables in database: {#DATABASE}</td>
         <td>Database {#DATABASE}: size</td>
         <td>Max age (datfrozenxid) in: {#DATABASE}</td>
+        <td>Count of invalid indexes in database: {#DATABASE}</td>
       </tr>
       <tr>
         <th>Key</th>
         <td>pgsql.database.bloating_tables[{#DATABASE}]</td>
         <td>pgsql.database.size[{#DATABASE}]</td>
         <td>pgsql.database.max_age[{#DATABASE}]</td>
+        <td>pgsql.database.invalid_indexes[{#DATABASE}]</td>
       </tr>
       <tr>
         <th>Type</th>
         <td>Numeric (float)</td>
         <td>Numeric (float)</td>
         <td>Numeric (float)</td>
+        <td>Numeric (float)</td>
       </tr>
       <tr>
         <th>Units</th>
         <td></td>
         <td>Bytes</td>
         <td></td>
+        <td></td>
       </tr>
       <tr>
         <th>Delta</th>
         <td>As Is</td>
         <td>As Is</td>
         <td>As Is</td>
+        <td>As Is</td>
       </tr>
     </table>
 
@@ -2596,6 +2601,11 @@ Default config:
       </tr>
     </table>
 
+#### Triggers
+
+1. **PostgreSQL invalid indexes in database {#DATABASE} (hostname={HOSTNAME} value={ITEM.LASTVALUE})**  
+    Triggers if *PostgreSQL: Count of invalid indexes in database: {#DATABASE}* > 0.
+
 ### Events
 
 ### Items

mamonsu/lib/runner.py

@@ -6,6 +6,7 @@
 import codecs
 import os
 
+from mamonsu import __version__
 import mamonsu.lib.platform as platform
 from mamonsu.lib.parser import parse_args, print_total_help
 from mamonsu.lib.config import Config
@@ -208,7 +209,7 @@ def quit_handler(_signo=None, _stack_frame=None):
     supervisor = Supervisor(cfg)
 
     try:
-        logging.info("Start mamonsu")
+        logging.info("Start mamonsu " + __version__)
         supervisor.start()
     except KeyboardInterrupt:
         quit_handler()

mamonsu/plugins/pgsql/databases.py

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 
+from distutils.version import LooseVersion
 from mamonsu.plugins.pgsql.plugin import PgsqlPlugin as Plugin
 from .pool import Pooler
 from mamonsu.lib.zbx_template import ZbxTemplate
@@ -16,6 +17,10 @@ class Databases(Plugin):
                  " datistemplate = false and datname = :'p1';"
     query_age = "select age(datfrozenxid) from pg_catalog.pg_database where datistemplate = false " \
                 "and datname = :'p1';"
+    query_invalid_indexes = "SELECT count (*) " \
+                            "FROM pg_catalog.pg_index i LEFT JOIN pg_catalog.pg_locks l " \
+                            "ON (i.indexrelid = l.relation) " \
+                            "WHERE NOT (i.indisvalid AND i.indisready) AND l.relation IS NULL;"
 
     # queries for zabbix agent
     query_agent_discovery = "SELECT json_build_object ('data',json_agg(json_build_object('{#DATABASE}',d.datname)))" \
@@ -26,6 +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_indexes = "pgsql.database.invalid_indexes{0}"
 
     DEFAULT_CONFIG = {'min_rows': str(50), 'bloat_scale': str(0.2)}
 
@@ -49,8 +55,14 @@ def run(self, zbx):
             zbx.send(
                 'pgsql.database.bloating_tables[{0}]'.format(info[0]),
                 int(bloat_count))
+            invalid_indexes_count = Pooler.query(
+                self.query_invalid_indexes,
+                info[0])[0][0]
+            zbx.send(
+                '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]))
@@ -100,6 +112,9 @@ def discovery_rules(self, template, dashboard=False):
              'delay': self.plugin_config('interval')},
             {'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_indexes, var_discovery="{#DATABASE},"),
+             'name': 'Count of invalid indexes in database: {#DATABASE}',
              'delay': self.plugin_config('interval')}
         ]
         graphs = [
@@ -129,7 +144,12 @@ def discovery_rules(self, template, dashboard=False):
                      'yaxisside': 1}]
             }
         ]
-        return template.discovery_rule(rule=rule, conditions=conditions, items=items, graphs=graphs)
+        triggers = [{
+            'name': 'PostgreSQL invalid indexes in database '
+                    '{#DATABASE} (hostname={HOSTNAME} value={ITEM.LASTVALUE})',
+            'expression': '{#TEMPLATE:pgsql.database.invalid_indexes[{#DATABASE}].last()}>0'}
+        ]
+        return template.discovery_rule(rule=rule, conditions=conditions, items=items, graphs=graphs, triggers=triggers)
 
     def keys_and_queries(self, template_zabbix):
         result = ['{0},$2 $1 -c "{1}"'.format(self.key_autovacumm.format("[*]"), Pooler.SQL['count_autovacuum'][0]),
@@ -139,5 +159,7 @@ def keys_and_queries(self, template_zabbix):
                   '{0},$3 $2 -d "$1" -c "{1}"'.format(self.key_db_bloating_tables.format("[*]"),
                                                       self.query_bloating_tables.format(
                                                           self.plugin_config('bloat_scale'),
-                                                          self.plugin_config('min_rows')))]
+                                                          self.plugin_config('min_rows'))),
+                  '{0},$3 $2 -d "$1" -c "{1}"'.format(self.key_invalid_indexes.format("[*]"),
+                                                      self.query_invalid_indexes)]
         return template_zabbix.key_and_query(result)