Merge branch 'dev'

Author: casperr0

mamonsu/__init__.py

@@ -1,7 +1,7 @@
 __author__ = 'Dmitry Vasilyev'
 __author_email__ = 'info@postgrespro.ru'
 __description__ = 'Monitoring agent for PostgreSQL'
-__version__ = '2.7.0'
+__version__ = '2.7.1'
 __licence__ = 'BSD'
 
 __url__ = 'https://github.com/postgrespro/mamonsu'

mamonsu/plugins/pgsql/connections.py

@@ -2,7 +2,6 @@
 
 from mamonsu.plugins.pgsql.plugin import PgsqlPlugin as Plugin
 from distutils.version import LooseVersion
-import mamonsu.lib.platform as platform
 from .pool import Pooler
 
 
@@ -24,12 +23,6 @@ class Connections(Plugin):
          'number of disabled',
          '00CCCC')
     ]
-    # ( key, name, graph)
-    Item_ppid_children = [
-        ('pgsql.count_all_pids{0}',
-         'Number of PostgreSQL parent pid children',
-         ('PostgreSQL: count children of PostgreSQL parent pid', 'BBB000', 0)),
-    ]
     Max_connections = None
 
     query_agent = "select count(*) from pg_catalog.pg_stat_activity where state = '{0}';"
@@ -82,12 +75,6 @@ def run(self, zbx):
             self.Max_connections = result[0][0]
         zbx.send('pgsql.connections[max_connections]', int(self.Max_connections))
 
-        # get number of child pids of ppid
-        if platform.LINUX:
-            num_of_children_pids = self.get_num_of_children_pids()
-            key = self.Item_ppid_children[0][0].format('[]')
-            zbx.send(key, num_of_children_pids+1)
-
     def items(self, template):
         result = template.item({
             'name': 'PostgreSQL: number of total connections',
@@ -111,11 +98,6 @@ def items(self, template):
                 'key': self.right_type(self.key, item[1]),
                 'delay': self.plugin_config('interval')
             })
-        result += template.item({
-            'name': 'PostgreSQL: number of child pids',
-            'key': self.right_type(self.Item_ppid_children[0][0]),
-            'delay': self.plugin_config('interval')
-        })
         return result
 
     def graphs(self, template):
@@ -137,10 +119,6 @@ def graphs(self, template):
             'key': self.right_type(self.key, "max_connections"),
             'color': '00BB00'
         })
-        items.append({
-            'key': self.right_type(self.Item_ppid_children[0][0]),
-            'color': '0BB000'
-        })
         graph = {'name': 'PostgreSQL connections', 'items': items}
         return template.graph(graph)
 

mamonsu/plugins/pgsql/plugin.py

@@ -34,28 +34,6 @@ def check(self, extension):
 
         return self._ext_installed
 
-    @staticmethod
-    def get_num_of_children_pids():
-        result = Pooler.query("SELECT pg_backend_pid();")
-        child_pid = result[0][0]
-        try:
-            parent_pid = subprocess.check_output(['ps', '-oppid', '--no-headers', '--pid', str(child_pid)],
-                                                 stderr=subprocess.PIPE, encoding='utf8')
-        except subprocess.CalledProcessError:
-            raise PluginDisableException("Unable to get parent process for {0} pid.".format(child_pid))
-
-        parent_pid = int(parent_pid.split("\n")[0])
-        try:
-            child_pids = subprocess.check_output(['ps', '-opid', '--no-headers', '--ppid', str(parent_pid)],
-                                           stderr=subprocess.PIPE, encoding='utf8')
-        except subprocess.CalledProcessError:
-            raise PluginDisableException("Unable to get children processes for {0} pid.".format(child_pid))
-        # we want to return number of ALL PostgreSQL processes meaning parent pid + count(children pids)
-        # len of the splitted result has extra blank line in the end so we return just the length of
-        # splitted child pids output
-        count_child_pids = len(child_pids.split("\n"))
-        return count_child_pids
-
     def disable_and_exit_if_extension_is_not_installed(self, ext, db=None):
         if not self.extension_installed(ext, db=db, silent=True):
             self.disable()

packaging/conf/old_templates/template_2.7.1.xml

@@ -1,3 +1,6 @@
+mamonsu (2.7.1-1) stable; urgency=low
+  * rm metric to count children of PostgreSQL parent pid
+
 mamonsu (2.7.0-1) stable; urgency=low
   * update bootstrap
   * fix ArchiveCommand plugin

packaging/conf/old_templates/template_agent_2.7.1.xml

@@ -2,7 +2,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           mamonsu
-Version:        2.7.0
+Version:        2.7.1
 Release:        1%{?dist}
 Summary:        Monitoring agent for PostgreSQL
 Group:          Applications/Internet
@@ -73,6 +73,9 @@ chown mamonsu.mamonsu /var/log/mamonsu
 /sbin/chkconfig --del mamonsu
 
 %changelog
+* Wed May 19 2021 Daria Vilkova <d.vilkova@postgrespro.ru>  - 2.7.1-1
+- rm metric to count children of PostgreSQL parent pid
+
 * Mon Apr 26 2021 Daria Vilkova <d.vilkova@postgrespro.ru>  - 2.7.0-1
 - update bootstrap
 - fix ArchiveCommand plugin

packaging/conf/template.xml

@@ -1,5 +1,5 @@
 Name:           mamonsu
-Version:        2.7.0
+Version:        2.7.1
 Release:        1%{?dist}
 Summary:        Monitoring agent for PostgreSQL
 Group:          Applications/Internet
@@ -70,6 +70,9 @@ chown mamonsu.mamonsu /var/log/mamonsu
 /sbin/chkconfig --del mamonsu
 
 %changelog
+* Wed May 19 2021 Daria Vilkova <d.vilkova@postgrespro.ru>  - 2.7.1-1
+- rm metric to count children of PostgreSQL parent pid
+
 * Mon Apr 26 2021 Daria Vilkova <d.vilkova@postgrespro.ru>  - 2.7.0-1
 - update bootstrap
 - fix ArchiveCommand plugin

packaging/conf/template_agent.xml

@@ -1,6 +1,6 @@
 %define _datarootdir %{_prefix}/share
 Name:           mamonsu
-Version:        2.7.0
+Version:        2.7.1
 Release:        1%{?dist}
 Summary:        Monitoring agent for PostgreSQL
 Group:          Applications/Internet
@@ -74,6 +74,9 @@ chown mamonsu.mamonsu /var/log/mamonsu
 /sbin/chkconfig --del mamonsu
 
 %changelog
+* Wed May 19 2021 Daria Vilkova <d.vilkova@postgrespro.ru>  - 2.7.1-1
+- rm metric to count children of PostgreSQL parent pid
+
 * Mon Apr 26 2021 Daria Vilkova <d.vilkova@postgrespro.ru>  - 2.7.0-1
 - update bootstrap
 - fix ArchiveCommand plugin