style: changed style formatting and removed mutable default agruments

Author: casperr0

mamonsu/lib/config.py

@@ -18,8 +18,10 @@
 
 class Config(DefaultConfig):
 
-    def __init__(self, cfg_file=None, plugin_directories=[]):
+    def __init__(self, cfg_file=None, plugin_directories=None):
 
+        if plugin_directories is None:
+            plugin_directories = []
         config = configparser.ConfigParser()
 
         config.add_section('postgres')

mamonsu/lib/get_keys.py

@@ -5,15 +5,19 @@
 class GetKeys(object):
     plg_type = 'all'
 
-    def txt(self, type, plugins=[]):
+    def txt(self, type, plugins=None):
         # sort plugins!
+        if plugins is None:
+            plugins = []
         self.plg_type = type
         plugins.sort(key=lambda x: x.__class__.__name__)
         # create template
         template_data = self._get_all('keys_and_queries', plugins)  # get data from all plugins
         return template_data
 
-    def _get_all(self, keys_and_queries, plugins=[]):
+    def _get_all(self, keys_and_queries, plugins=None):
+        if plugins is None:
+            plugins = []
         result = ''
         # don't need keys for zabbix agent from these classes
         non_keys_classes = ('AgentApi', 'LogSender', 'ZbxSender')
@@ -28,7 +32,9 @@ def _get_all(self, keys_and_queries, plugins=[]):
                     result += row
         return result
 
-    def key_and_query(self, args=[]):
+    def key_and_query(self, args=None):
+        if args is None:
+            args = []
         result = ""
         for one in args:
             result += 'UserParameter={0}\n'.format(one)

mamonsu/lib/parser.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 import sys
 from mamonsu import __version__
-from optparse import OptionParser, BadOptionError, OptionGroup
+from optparse import OptionParser, BadOptionError
 import mamonsu.lib.platform as platform
 
 usage_msg = """
@@ -180,7 +180,7 @@ def print_total_help():
 
 class MissOptsParser(OptionParser):
 
-    def print_help(self):
+    def print_help(self, **kwargs):
         print("""
 
 
@@ -250,7 +250,7 @@ def _process_short_opts(self, rargs, values):
     def _add_help_option(self):
         self.add_option("--help",
                         action="help",
-                        help=("show this help message and exit"))
+                        help="show this help message and exit")
 
 
 def parse_args():

mamonsu/lib/plugin.py

@@ -24,7 +24,7 @@ class Plugin(object):
     AgentPluginType = 'all'
 
     # PG version
-    VersionPG = {'type': 'PG_V', 'number': '10.0'}
+    VersionPG = '10'
 
     # Macros for run as agent type or as mamonsu
     Macros = {"mamonsu": "", "agent": "{$PG_CONNINFO},{$PG_PATH}"}
@@ -33,7 +33,7 @@ class Plugin(object):
     Interval = 60
 
     # plugin config
-    DEFAULT_CONFIG = {}  # type: Dict[str, str]
+    DEFAULT_CONFIG = {}  # type: dict[str, str]
 
     _thread = None  # type: Thread
     _sender = False
@@ -46,7 +46,7 @@ class Plugin(object):
     old_zabbix = False
 
     # const
-    PATH = "/etc/zabbix/zabbix_agent.d/scripts"
+    PATH = "/etc/zabbix/zabbix_agentd.d/scripts"
     DELTA = Template.DELTA
     GRAPH_TYPE = Template.GRAPH_TYPE
     VALUE_TYPE = Template.VALUE_TYPE
@@ -156,7 +156,7 @@ def _log_exception(self, e, trace):
         self.log.debug(trace)
 
     def _loop(self):
-        while (True):
+        while True:
             last_start = time.time()
             try:
                 self.run(self.sender)

mamonsu/lib/sender.py

@@ -6,7 +6,7 @@
 import mamonsu.lib.platform as platform
 
 
-class Sender():
+class Sender:
 
     def __init__(self):
         self._senders = []

mamonsu/lib/senders/zbx.py

@@ -14,8 +14,8 @@
 from mamonsu.lib.queue import Queue
 from itertools import islice
 
-class ZbxSender(Plugin):
 
+class ZbxSender(Plugin):
     Interval = 10
     _sender = True
 
@@ -64,14 +64,14 @@ def _flush(self):
         })
         self._send_data(data)
 
-    def send_file_to_zabbix (self,path):
+    def send_file_to_zabbix(self, path):
         zabbix_client = self.config.fetch('zabbix', 'client')
         self.log.setLevel((self.config.fetch('log', 'level')).upper())
 
         metrics = []
         with open(path, 'r') as f:
             while True:
-                lines=list(islice(f, 100))
+                lines = list(islice(f, 100))
                 for line in lines:
                     try:
                         split_line = line.rstrip('\n').split('\t')
@@ -83,9 +83,11 @@ def send_file_to_zabbix (self,path):
                                 'clock': int(split_line[0])}
                             metrics.append(metric)
                         else:
-                            self.log.error('Can\'t load metric in line: "{0}". The line must have the format: time <tab> value <tab> metric\'s name.'.format(line.rstrip('\n')))
+                            self.log.error(
+                                'Can\'t load metric in line: "{0}". The line must have the format: time <tab> value <tab> metric\'s name.'.format(
+                                    line.rstrip('\n')))
                     except Exception as e:
-                        self.log.error('Can\'t load metric in line: "{0}". Error : {1} '.format(line.rstrip('\n'),e,))
+                        self.log.error('Can\'t load metric in line: "{0}". Error : {1} '.format(line.rstrip('\n'), e, ))
 
                 data = json.dumps({
                     'request': 'sender data',

mamonsu/lib/supervisor.py

@@ -10,7 +10,6 @@
 
 
 class Supervisor(object):
-
     Running = True
 
     def __init__(self, config):
@@ -42,7 +41,7 @@ def _start_plugins(self):
                 plugin.start()
             else:
                 plugin.log.info('plugin {0} was disabled due to the statement in '
-                          'the config file '. format(plugin.__class__.__name__.lower()))
+                                'the config file '.format(plugin.__class__.__name__.lower()))
 
     def _loop(self):
         plugin_errors, plugin_probes, last_error = 0, 0, ''

mamonsu/lib/zbx_template.py

@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-from xml.dom import minidom
 from mamonsu.lib.const import Template
 from mamonsu.lib.plugin import Plugin
 import re
@@ -118,14 +117,14 @@ def turn_agent_type(self, xml):
         xml = re.sub(r"<type>2", "<type>0", xml)
         return xml
 
-    def xml(self, type, plugins=[]):
+    def xml(self, type, plugins=None):
         # sort plugins!
+        if plugins is None:
+            plugins = []
         plugins.sort(key=lambda x: x.__class__.__name__)
         self.plg_type = type
         # create template
-        template_data = {}
-        template_data['template'] = self.Template
-        template_data['application'] = self.Application
+        template_data = {'template': self.Template, 'application': self.Application}
         if Plugin.Type == 'agent':
             template_data['macros'] = self._macro()
         else:
@@ -139,7 +138,9 @@ def xml(self, type, plugins=[]):
             output_xml = ZbxTemplate.turn_agent_type(self, output_xml)
         return output_xml
 
-    def _get_all(self, items='items', plugins=[]):
+    def _get_all(self, items='items', plugins=None):
+        if plugins is None:
+            plugins = []
         result = ''
         for plugin in plugins:
             if plugin.AgentPluginType == self.plg_type or self.plg_type == 'all':
@@ -157,12 +158,16 @@ def _macro(self, xml_key='macro'):
         result += '<{1}>{0}</{1}>'.format(self._format_args(self.macro_defaults, value), xml_key)
         return result
 
-    def item(self, args={}, xml_key='item'):
+    def item(self, args=None, xml_key='item'):
+        if args is None:
+            args = {}
         return '<{2}>{0}{1}</{2}>'.format(
             self._format_args(self.item_defaults, args),
             self._application(), xml_key)
 
-    def trigger(self, args={}, xml_key='trigger', defaults=None):
+    def trigger(self, args=None, xml_key='trigger', defaults=None):
+        if args is None:
+            args = {}
         if defaults is None:
             defaults = self.trigger_defaults
         try:
@@ -175,7 +180,9 @@ def trigger(self, args={}, xml_key='trigger', defaults=None):
             self._format_args(defaults, args),
             xml_key)
 
-    def graph(self, args={}, xml_key='graph'):
+    def graph(self, args=None, xml_key='graph'):
+        if args is None:
+            args = {}
         try:
             items = args['items']
         except KeyError:
@@ -201,7 +208,9 @@ def graph(self, args={}, xml_key='graph'):
             graph_items, xml_key)
 
     # condition for template creation for zabbix version 4.4
-    def condition(self, args={}, xml_key='condition'):
+    def condition(self, args=None, xml_key='condition'):
+        if args is None:
+            args = {}
         try:
             conditions = args['condition']
         except KeyError:
@@ -216,8 +225,18 @@ def condition(self, args={}, xml_key='condition'):
 
         return res
 
-    def discovery_rule(self, rule={},conditions=[], items=[], triggers=[], graphs=[]):
+    def discovery_rule(self, rule=None, conditions=None, items=None, triggers=None, graphs=None):
 
+        if rule is None:
+            rule = {}
+        if conditions is None:
+            conditions = []
+        if items is None:
+            items = []
+        if triggers is None:
+            triggers = []
+        if graphs is None:
+            graphs = []
         result_items = '<item_prototypes>'
         for item in items:
             result_items += self.item(item, xml_key='item_prototype')
@@ -237,7 +256,6 @@ def discovery_rule(self, rule={},conditions=[], items=[], triggers=[], graphs=[]
         result_graphs += '</graph_prototypes>'
 
         if len(conditions) > 0:
-
             result_conditions = '<filter>'
             for condition in conditions:
                 result_conditions += self.condition(