fix: auto export template for version 4.0+ zabbix server and export template for unsupported versions with flag --old-zabbix

casperr0 · casperr0 · commit f5ba48622a10 · 2019-10-28T14:24:20.000+03:00
diff --git a/mamonsu/lib/parser.py b/mamonsu/lib/parser.py
@@ -46,10 +46,13 @@
     --pg-version <pg_version>
     --add-plugins <directory>
     --config  <file>
+    --old-zabbix
 Default plugin_type = all, template name = PostgresPro-<platform name>,
 application = App-PostgresPro-<platform name>, pg-version = 10,
 Note: default pg-version is vanilla, but with PGPRO or PGEE before version number it can be changed. Supported version 
 numbers are 10, 11, 9.6, 9.5
+default template export for currently supported zabbix -server versions, if template for unsupported versions 
+is needed use --old zabbix flag
 Example: PGPRO_10 or PGEE_11 or PGPRO_9.6
 
 
@@ -62,7 +65,10 @@
     --template-name <template name>
     --application <application name in template>
     --config <file>
+    --old-zabbix
 Default template name = PostgresPro-<platform name>, application = App-PostgresPro-<platform name>
+Note: default template export for currently supported zabbix -server versions, if template for unsupported versions 
+is needed use --old zabbix flag
 
 
 Bootstrap DDL for monitoring:
@@ -261,4 +267,8 @@ def parse_args():
     parser.add_option(
         '--application', dest='application',
         default='App-PostgresPro-{0}'.format(sys.platform.title()))
+    parser.add_option(
+        '--old-zabbix',
+        dest='old_zabbix', action='store_true',
+        help='Create special template for currently unsupported zabbix versions')
     return parser.parse_args()
diff --git a/mamonsu/lib/plugin.py b/mamonsu/lib/plugin.py
@@ -42,6 +42,9 @@ class Plugin(object):
     # for all childs
     is_child = True
 
+    # old_zabbix_server_version
+    old_zabbix = False
+
     # const
     PATH = "/etc/zabbix/zabbix_agent.d/scripts"
     DELTA = Template.DELTA
diff --git a/mamonsu/lib/runner.py b/mamonsu/lib/runner.py
@@ -57,6 +57,8 @@ def quit_handler(_signo=None, _stack_frame=None):
             version_args = args.pg_version.split('_')
             define_pg_version(version_args)
             cfg = Config(args.config_file, args.plugins_dirs)
+            if args.old_zabbix:
+                Plugin.old_zabbix = True
             if not len(commands) == 2 and not len(commands) == 3:
                 print_total_help()
             if commands[1] == 'zabbix-parameters':
@@ -122,7 +124,7 @@ def quit_handler(_signo=None, _stack_frame=None):
                     commands.append('postgrespro.xml')
                     print('Template for mamonsu have been saved in postgrespro.conf file')
                 for klass in Plugin.only_child_subclasses():
-                    if klass.__name__ == "PgWaitSampling":  # check if plugin is for EE
+                    if klass.__name__ == "PgWaitSampling" or klass.__name__ == "Cfs" :  # check if plugin is for EE
                         if Plugin.VersionPG['type'] == 'PGEE':
                             plugins.append(klass(cfg))
                     else:
diff --git a/mamonsu/lib/zbx_template.py b/mamonsu/lib/zbx_template.py
@@ -55,7 +55,7 @@ class ZbxTemplate(object):
         ('snmpv3_contextname', None), ('snmpv3_securityname', None),
         ('snmpv3_securitylevel', 0), ('snmpv3_authprotocol', 0),
         ('snmpv3_authpassphrase', None), ('snmpv3_privprotocol', 0),
-        ('snmpv3_privpassphrase', None), ('formula', 1),
+        ('snmpv3_privpassphrase', None), ('logtimefmt', None), ('formula', 1),
         ('delay_flex', None), ('params', None),
         ('ipmi_sensor', None), ('data_type', 0), ('authtype', 0),
         ('username', None), ('password', None), ('publickey', None),
@@ -89,14 +89,20 @@ class ZbxTemplate(object):
         ('calc_fnc', 2), ('type', Template.GRAPH_TYPE.normal)
     ]
 
+    condition_defaults = [
+        ('macro', None), ('value', 0),
+        ('operator', None),
+        ('formulaid', None)
+    ]
+
     discovery_defaults = [
         ('name', None), ('type', 2), ('snmp_community', None),
         ('snmp_oid', None), ('delay', 60), ('status', 0),
         ('allowed_hosts', None), ('snmpv3_contextname', None),
         ('snmpv3_securityname', None), ('snmpv3_securitylevel', 0),
         ('snmpv3_authprotocol', 0), ('snmpv3_authpassphrase', None),
         ('snmpv3_privprotocol', 0), ('snmpv3_privpassphrase', None),
-        ('delay_flex', None), ('params', None), ('filter', None),
+        ('delay_flex', None), ('params', None),
         ('ipmi_sensor', None), ('authtype', 0),
         ('username', None), ('password', None), ('publickey', None),
         ('privatekey', None), ('port', None), ('lifetime', 7),
@@ -194,7 +200,23 @@ def graph(self, args={}, xml_key='graph'):
             self._format_args(self.graph_values_defaults, args),
             graph_items, xml_key)
 
-    def discovery_rule(self, rule={}, items=[], triggers=[], graphs=[]):
+    # condition for template creation for zabbix version 4.4
+    def condition(self, args={}, xml_key='condition'):
+        try:
+            conditions = args['condition']
+        except KeyError:
+            raise LookupError(
+                'Miss item in conditions: {0}.'.format(args))
+        res = ''
+        for idx, item in enumerate(conditions):
+            res += '<{1}>{0}</{1}>'.format(
+                self._format_args(self.condition_defaults, item),
+                xml_key)
+        res = '<conditions>' + res + '</conditions>' + '<formula/><evaltype>0</evaltype>'
+
+        return res
+
+    def discovery_rule(self, rule={},conditions=[], items=[], triggers=[], graphs=[]):
 
         result_items = '<item_prototypes>'
         for item in items:
@@ -214,10 +236,24 @@ def discovery_rule(self, rule={}, items=[], triggers=[], graphs=[]):
                 graph, xml_key='graph_prototype')
         result_graphs += '</graph_prototypes>'
 
-        result = '<discovery_rule>{0}{1}{2}{3}</discovery_rule>'
+        if len(conditions) > 0:
+
+            result_conditions = '<filter>'
+            for condition in conditions:
+                result_conditions += self.condition(
+                    condition, xml_key='condition')
+            result_conditions += '</filter>'
+        else:
+            result = '<discovery_rule>{0}{1}{2}{3}</discovery_rule>'
+            self.discovery_defaults.append(('filter', None))
+            return result.format(
+                self._format_args(self.discovery_defaults, rule),
+                result_items, result_triggers, result_graphs)
+
+        result = '<discovery_rule>{0}{1}{2}{3}{4}</discovery_rule>'
         return result.format(
             self._format_args(self.discovery_defaults, rule),
-            result_items, result_triggers, result_graphs)
+            result_conditions, result_items, result_triggers, result_graphs)
 
     def _application(self):
         result = '<applications><application><name>{0}'
diff --git a/mamonsu/plugins/pgsql/cfs.py b/mamonsu/plugins/pgsql/cfs.py
@@ -159,21 +159,36 @@ def graphs(self, template):
     def discovery_rules(self, template):
         rule = {
             'name': 'Compressed relations discovery',
-            'key': 'pgsql.cfs.discovery_compressed_relations[]',
-            'filter': '{#COMPRESSED_RELATION}:.*'
+            'key': 'pgsql.cfs.discovery_compressed_relations[]'
+            # 'filter': '{#COMPRESSED_RELATION}:.*'
         }
+        if Plugin.old_zabbix:
+            rule['filter'] = '{#DATABASE}:.*'
+            conditions = []
+        else:
+            conditions = [
+                {
+                    'condition': [
+                        {'macro': '{#COMPRESSED_RELATION}',
+                         'value': '.*',
+                         'operator': '',
+                         'formulaid': 'A'}
+                    ]
+                }
+
+            ]
         items = [
             {'key': 'pgsql.cfs.compress_ratio[{#COMPRESSED_RELATION}]',
-                'name': 'Relation {#COMPRESSED_RELATION}: compress ratio',
-                'delay': self.timeRatioInterval}
+             'name': 'Relation {#COMPRESSED_RELATION}: compress ratio',
+             'delay': self.timeRatioInterval}
         ]
         graphs = [
             {
                 'name': 'Relation {#COMPRESSED_RELATION}: compress ratio',
                 'delay': self.timeRatioInterval,
                 'items': [
                     {'color': '00CC00',
-                        'key': 'pgsql.cfs.compress_ratio[{#COMPRESSED_RELATION}]'}]
+                     'key': 'pgsql.cfs.compress_ratio[{#COMPRESSED_RELATION}]'}]
             },
         ]
-        return template.discovery_rule(rule=rule, items=items, graphs=graphs)
+        return template.discovery_rule(rule=rule, conditions=conditions, items=items, graphs=graphs)
diff --git a/mamonsu/plugins/pgsql/databases.py b/mamonsu/plugins/pgsql/databases.py
@@ -64,8 +64,23 @@ def discovery_rules(self, template):
         rule = {
             'name': 'Database discovery',
             'key': self.key_db_discovery.format('[{0}]'.format(self.Macros[self.Type])),
-            'filter': '{#DATABASE}:.*'
+
         }
+        if Plugin.old_zabbix:
+            conditions = []
+            rule['filter'] = '{#DATABASE}:.*'
+        else:
+            conditions = [
+                {
+                    'condition': [
+                        {'macro': '{#DATABASE}',
+                        'value': '.*',
+                        'operator': '',
+                        'formulaid': 'A'}
+                    ]
+                }
+
+            ]
         items = [
             {'key': self.right_type(self.key_db_size, var_discovery="{#DATABASE},"),
              'name': 'Database {#DATABASE}: size',
@@ -106,7 +121,7 @@ def discovery_rules(self, template):
                      'yaxisside': 1}]
             }
         ]
-        return template.discovery_rule(rule=rule, items=items, graphs=graphs)
+        return template.discovery_rule(rule=rule, conditions=conditions, items=items, graphs=graphs)
 
     def keys_and_queries(self, template_zabbix):
         result = []
diff --git a/mamonsu/plugins/pgsql/pg_wait_sampling.py b/mamonsu/plugins/pgsql/pg_wait_sampling.py
@@ -206,10 +206,24 @@ def graphs(self, template):
     def discovery_rules(self, template):
         rule = ({
             'name': 'AllLockItems',
-            'key': self.key_all_lock_discovery.format('[{0}]'.format(self.Macros[self.Type])),
-            'filter': '{#ALL_LOCK}:.*'
+            'key': self.key_all_lock_discovery.format('[{0}]'.format(self.Macros[self.Type]))
         })
 
+        if Plugin.old_zabbix:
+            rule['filter'] = '{#ALL_LOCK}:.*'
+            conditions = []
+        else:
+            conditions = [
+                {
+                    'condition': [
+                        {'macro': '{#ALL_LOCK}',
+                         'value': '.*',
+                         'operator': '',
+                         'formulaid': 'A'}
+                    ]
+                }
+
+            ]
         if self.Type == "mamonsu":
             delta = Plugin.DELTA.as_is
         else:
@@ -235,7 +249,7 @@ def discovery_rules(self, template):
                 'color': item[3]})
             graphs.append({'name': graph_name, 'type': 1, 'items': items})
 
-        return template.discovery_rule(rule=rule, items=items, graphs=graphs)
+        return template.discovery_rule(rule=rule, conditions=conditions, items=items, graphs=graphs)
 
     def keys_and_queries(self, template_zabbix):
         result = []
diff --git a/mamonsu/plugins/system/linux/disk_sizes.py b/mamonsu/plugins/system/linux/disk_sizes.py
@@ -28,7 +28,7 @@ class DiskSizes(Plugin):
         'efivarfs', 'fusectl', 'fuse.gvfsd-fuse',
         'hugetlbfs', 'mqueue', 'binfmt_misc',
         'nfsd', 'proc', 'pstore', 'selinuxfs'
-        'rpc_pipefs', 'securityfs', 'sysfs',
+                                  'rpc_pipefs', 'securityfs', 'sysfs',
         'nsfs', 'tmpfs', 'tracefs']
 
     def run(self, zbx):
@@ -72,9 +72,23 @@ def discovery_rules(self, template):
             key_discovery = 'system.vfs.discovery'
         rule = {
             'name': 'VFS discovery',
-            'key': key_discovery,
-            'filter': '{#MOUNTPOINT}:.*'
+            'key': key_discovery
         }
+        if Plugin.old_zabbix:
+            rule['filter'] = '{#MOUNTPOINT}:.*'
+            conditions = []
+        else:
+            conditions = [
+                {
+                    'condition': [
+                        {'macro': '{#MOUNTPOINT}',
+                         'value': '.*',
+                         'operator': '',
+                         'formulaid': 'A'}
+                    ]
+                }
+
+            ]
         items = [
             {
                 'key': 'system.vfs.used[{#MOUNTPOINT}]',
@@ -129,7 +143,7 @@ def discovery_rules(self, template):
             })
 
         return template.discovery_rule(
-            rule=rule, items=items, graphs=graphs, triggers=triggers)
+            rule=rule, conditions=conditions, items=items, graphs=graphs, triggers=triggers)
 
     def keys_and_queries(self, template_zabbix):
         result = []
diff --git a/mamonsu/plugins/system/linux/disk_stats.py b/mamonsu/plugins/system/linux/disk_stats.py
@@ -124,9 +124,23 @@ def discovery_rules(self, template):
             delta = Plugin.DELTA_SPEED
         rule = {
             'name': 'Block device discovery',
-            'key': key_discovery,
-            'filter': '{#BLOCKDEVICE}:.*'
+            'key': key_discovery
         }
+        if Plugin.old_zabbix:
+            rule['filter'] = '{#BLOCKDEVICE}:.*'
+            conditions = []
+        else:
+            conditions = [
+                {
+                    'condition': [
+                        {'macro': '{#BLOCKDEVICE}',
+                         'value': '.*',
+                         'operator': '',
+                         'formulaid': 'A'}
+                    ]
+                }
+
+            ]
         items = [
             {
                 'key': 'system.disk.utilization[{#BLOCKDEVICE}]',
@@ -183,7 +197,7 @@ def discovery_rules(self, template):
                         'key': 'system.disk.utilization[{#BLOCKDEVICE}]'}]
             }]
 
-        return template.discovery_rule(rule=rule, items=items, graphs=graphs)
+        return template.discovery_rule(rule=rule, conditions=conditions, items=items, graphs=graphs)
 
     def keys_and_queries(self, template_zabbix):
         result = []
diff --git a/mamonsu/plugins/system/linux/net.py b/mamonsu/plugins/system/linux/net.py
@@ -52,9 +52,23 @@ def discovery_rules(self, template):
 
         rule = {
             'name': 'Net iface discovery',
-            'key': key_discovery,
-            'filter': '{#NETDEVICE}:.*'
+            'key': key_discovery
         }
+        if Plugin.old_zabbix:
+            rule['filter'] = '{#NETDEVICE}:.*'
+            conditions = []
+        else:
+            conditions = [
+                {
+                    'condition': [
+                        {'macro': '{#NETDEVICE}',
+                         'value': '.*',
+                         'operator': '',
+                         'formulaid': 'A'}
+                    ]
+                }
+
+            ]
         graphs = [{
             'name': 'Network device: {#NETDEVICE}',
             'items': [{
@@ -64,7 +78,7 @@ def discovery_rules(self, template):
                     'color': '0000CC',
                     'key': 'system.net.tx_bytes[{#NETDEVICE}]'}]
         }]
-        return template.discovery_rule(rule=rule, items=items, graphs=graphs)
+        return template.discovery_rule(rule=rule,conditions=conditions, items=items, graphs=graphs)
 
     def keys_and_queries(self, template_zabbix):
         result = []
diff --git a/tests/check.sh b/tests/check.sh
@@ -49,11 +49,11 @@ grep external_plugin_config /tmp/config || exit 3
 sed -i 's|.*max_checkpoint_by_wal_in_hour =.*|max_checkpoint_by_wal_in_hour = 5555555555555|g' /tmp/config
 
 # write zabbix template
-mamonsu export template $ZABBIX_TEMPLATE -t $ZABBIX_TEMPLATE_NAME -c /tmp/config
+mamonsu export template $ZABBIX_TEMPLATE -t $ZABBIX_TEMPLATE_NAME -c /tmp/config --old-zabbix 
 grep 5555555555555 /tmp/template.xml || exit 4
 grep 'pgsql\.uptime\[\]' /tmp/template.xml || exit 4
 grep 'system\.disk\.all_read' /tmp/template.xml || exit 4
-
+grep 'pgsql\.database\.discovery' /tmp/template.xml || exit 4
 # test export config
 cat <<EOF > /etc/mamonsu/agent.conf
 [zabbix]
@@ -74,6 +74,7 @@ grep external_plugin_config2 /tmp/config || exit 5
 # install zabbix
 yum install -y http://repo.zabbix.com/zabbix/2.4/rhel/6/x86_64/zabbix-release-2.4-1.el6.noarch.rpm
 yum install -y zabbix-server-pgsql zabbix-web-pgsql
+
 sed -i "s,;date.timezone =,date.timezone = 'US/Eastern'," /etc/php.ini
 su postgres -c 'createdb zabbix'
 su postgres -c 'createuser -a -d -E zabbix'
