Fix pycodestyle / pylint

Author: mohierf

alignak/daemons/arbiterdaemon.py

@@ -1811,7 +1811,6 @@ def get_livesynthesis(self):
                     'hosts_acknowledged': 0,
                     'hosts_in_downtime': 0,
                     'hosts_flapping': 0,
-    
                     'services_total': 0,
                     'services_not_monitored': 0,
                     'services_ok_hard': 0,

alignak/dispatcher.py

@@ -304,10 +304,10 @@ def check_status(self):
 
             try:
                 daemon_link.statistics = daemon_link.get_daemon_stats(details=True)
-                daemon_link.statistics['_freshness'] = int(time.time())
-                statistics[daemon_link.name] = daemon_link.statistics
-                logger.debug("Daemon %s statistics: %s" % (daemon_link.name,
-                                                           daemon_link.statistics))
+                if daemon_link.statistics:
+                    daemon_link.statistics['_freshness'] = int(time.time())
+                    statistics[daemon_link.name] = daemon_link.statistics
+                    logger.debug("Daemon %s statistics: %s", daemon_link.name, daemon_link.statistics)
             except LinkError:
                 logger.warning("Daemon connection failed, I could not get statistics.")
 

alignak/macroresolver.py

@@ -169,6 +169,7 @@ def init(self, conf):
         self.contactgroups = self.my_conf.contactgroups
         self.lists_on_demand.append(self.contactgroups)
         self.illegal_macro_output_chars = self.my_conf.illegal_macro_output_chars
+        self.env_prefix = self.my_conf.env_variables_prefix
 
     @staticmethod
     def _get_macros(chain):
@@ -298,11 +299,13 @@ def get_env_macros(self, data):
 
                 prop = macros[macro]
                 value = self._get_value_from_element(obj, prop)
-                env['NAGIOS_%s' % macro] = value
+                env['%s%s' % (self.env_prefix, macro)] = value
             if hasattr(obj, 'customs'):
                 # make NAGIOS__HOSTMACADDR from _MACADDR
                 for cmacro in obj.customs:
-                    new_env_name = 'NAGIOS__' + obj.__class__.__name__.upper() + cmacro[1:].upper()
+                    new_env_name = '%s_%s%s' % (self.env_prefix,
+                                                obj.__class__.__name__.upper(),
+                                                cmacro[1:].upper())
                     env[new_env_name] = obj.customs[cmacro]
 
         return env

alignak/objects/config.py

@@ -639,6 +639,8 @@ class Config(Item):  # pylint: disable=R0904,R0902
         'illegal_macro_output_chars':
             StringProp(default='',
                        class_inherit=[(Host, None), (Service, None), (Contact, None)]),
+        'env_variables_prefix':
+            StringProp(default='ALIGNAK_'),
 
         'use_regexp_matching':
             BoolProp(managed=False,

alignak/scheduler.py

@@ -2071,7 +2071,7 @@ def get_objects_from_from_queues(self):
         return self.my_daemon.get_objects_from_from_queues()
 
     def get_scheduler_stats(self, details=False):  # pylint: disable=unused-argument
-        # pylint: disable=too-many-locals
+        # pylint: disable=too-many-locals, too-many-branches
         """Get the scheduler statistics
 
         :return: A dict with the following structure

setup.cfg

@@ -1,21 +1,10 @@
 [bdist_wheel]
 universal = 1
 
+[metadata]
+license_file = LICENSE
+
 [build_sphinx]
 source-dir = doc/source
 build-dir  = doc/build
 all_files  = 1
-
-[files]
-data_files =
-    etc/alignak = etc/*
-
-[entry_points]
-console_scripts =
-    alignak-environment = alignak.bin.alignak_environment:main
-    alignak-arbiter = alignak.bin.alignak_arbiter:main
-    alignak-broker = alignak.bin.alignak_broker:main
-    alignak-receiver = alignak.bin.alignak_receiver:main
-    alignak-reactionner = alignak.bin.alignak_reactionner:main
-    alignak-poller = alignak.bin.alignak_poller:main
-    alignak-scheduler = alignak.bin.alignak_scheduler:main

setup.py

@@ -18,50 +18,37 @@
     pass
 
 # Define the list of requirements with specified versions
-requirements = [
-    # Still needing future for the CarbonIFace lib and some other stuff (queues, ...)
-    # Needing six for python 2.7/3 compatibility
-    'future==0.16.0',
-    'six==1.11.0',
-
-    # Alignak supports the most recent CherryPy
-    'CherryPy==15.0.0',
-
-    # Requests to communicate between the daemons
-    'requests==2.18.4',
-
-    # importlib is used to import modules used by the daemons
-    'importlib' if sys.version_info <= (2,7) else '',
-
-    # Colored console log
-    'termcolor==1.1.0',
-
-    # Set process titles
-    'setproctitle==1.1.10',
-
-    # ujson is used for the internal objects serialization
-    'ujson==1.35',
-
-    # numpy for date and percentile computation - needs a compiler on the installation target system!
-    # Comment to use an internal implementation of percentile function
-    'numpy==1.14.3',
-
-    # SSL between the daemons
-    # This requirement is only a requirement if you intend to use SLL for the inter-daemons
-    # communication. As such, to avoid installing this library per default, commenting this line!
-    # Uncomment or `pip install pyopenssl` if SSL must be used between the Alignak daemons
-    # pyopenssl
-
-    # configparser is used to parse command line of the daemons
-    'configparser' if sys.version_info <= (2,7) else '',
-    # docopt is used by the alignak_environment script
-    'docopt==0.6.2',
-
-    # Use psutil for daemons memory monitoring (env ALIGNAK_DAEMONS_MONITORING)
-    # Use psutil for scheduler ALIGNAK_LOG_MONITORING
-    # Use psutil for launching daemons from the Arbiter
-    'psutil==5.4.5'
-]
+def read_requirements(filename='requirements.txt'):
+    """Reads the list of requirements from given file.
+
+    :param filename: Filename to read the requirements from.
+                     Uses ``'requirements.txt'`` by default.
+
+    :return: Requirments as list of strings.
+    """
+    # allow for some leeway with the argument
+    if not filename.startswith('requirements'):
+        filename = 'requirements-' + filename
+    if not os.path.splitext(filename)[1]:
+        filename += '.txt'  # no extension, add default
+
+    def valid_line(line):
+        line = line.strip()
+        return line and not any(line.startswith(p) for p in ('#', '-'))
+
+    def extract_requirement(line):
+        egg_eq = '#egg='
+        if egg_eq in line:
+            _, requirement = line.split(egg_eq, 1)
+            return requirement
+        return line
+
+    with open(filename) as f:
+        lines = f.readlines()
+        return list(map(extract_requirement, filter(valid_line, lines)))
+requirements = read_requirements()
+print(requirements)
+# exit()
 
 # Better to use exec to load the VERSION from alignak/version.py
 # so to not have to import the alignak package:
@@ -138,23 +125,8 @@
     zip_safe=False,
     platforms='any',
 
-    # Dependencies (if some) ...
-    install_requires=[
-        # Do not set specific versions - for development purposes, use the most recent versions
-        # More about this: https://packaging.python.org/discussions/
-        # install-requires-vs-requirements/#install-requires-vs-requirements-files
-        'future',
-        'six',
-        'importlib' if sys.version_info <= (2,7) else '',
-        'CherryPy',
-        'requests',
-        'termcolor',
-        'setproctitle',
-        'ujson',
-        'numpy',
-        'docopt',
-        'psutil'
-    ],
+    # Dependencies...
+    install_requires=requirements,
     dependency_links=[
         # Use the standard PyPi repository
         "https://pypi.python.org/simple/",

test/cfg/cfg_macroresolver.cfg

@@ -2,6 +2,7 @@ cfg_dir=default
 
 ; Configure specific Alignak parameters
 illegal_macro_output_chars=`~\$&|'"<>
+#env_variables_prefix=NAGIOS_
 enable_environment_macros=0
 
 $USER1$=plugins

test/cfg/cfg_macroresolver_environment.cfg

@@ -2,6 +2,7 @@ cfg_dir=default
 
 ; Configure specific Alignak parameters
 illegal_macro_output_chars=`~\$&|'"<>
+env_variables_prefix=NAGIOS_
 enable_environment_macros=1
 
 $USER1$=plugins

test/setup_test.sh

@@ -29,10 +29,9 @@ pip install --upgrade pip
 sudo addgroup --system alignak
 sudo adduser --system alignak --ingroup alignak
 
-# install prog AND tests requirements :
-pip install --upgrade -r requirements.txt
-pip install -e .
+# install application AND tests requirements :
 pip install --upgrade -r test/requirements.txt
+pip install -e .
 
 pyversion=$(python -c "import sys; print(''.join(map(str, sys.version_info[:2])))")
 if test -e "test/requirements.py${pyversion}.txt"

test/test_a_properties_default.py

@@ -233,6 +233,7 @@ class TestConfig(PropertiesTester, AlignakTest):
         ('date_format', None),
         ('use_timezone', ''),
         ('illegal_object_name_chars', '`~!$%^&*"|\'<>?,()='),
+        ('env_variables_prefix', 'ALIGNAK_'),
         ('illegal_macro_output_chars', ''),
         ('use_regexp_matching', False),
         ('use_true_regexp_matching', None),

test/test_macros_resolver.py

@@ -513,13 +513,17 @@ def test_env_macros(self):
         data = [hst, svc]
         data.append(self._arbiter.conf)
 
+        # Macros are existing in the environment with a prefix which defaults to ALIGNAK_
+        # but this prefix may be overriden in the configuration
+        # assert mr.env_prefix == 'ALIGNAK_'
+
         env = mr.get_env_macros(data)
         assert env != {}
-        assert 'test_host_0' == env['NAGIOS_HOSTNAME']
-        assert 0.0 == env['NAGIOS_SERVICEPERCENTCHANGE']
-        assert 'custvalue' == env['NAGIOS__SERVICECUSTNAME']
-        assert 'gnulinux' == env['NAGIOS__HOSTOSTYPE']
-        assert 'NAGIOS_USER1' not in env
+        assert 'test_host_0' == env['%sHOSTNAME' % mr.env_prefix]
+        assert 0.0 == env['%sSERVICEPERCENTCHANGE' % mr.env_prefix]
+        assert 'custvalue' == env['%s_SERVICECUSTNAME' % mr.env_prefix]
+        assert 'gnulinux' == env['%s_HOSTOSTYPE' % mr.env_prefix]
+        assert '%sUSER1'  % mr.env_prefix not in env
 
     def test_resource_file(self):
         """
@@ -925,6 +929,9 @@ def setUp(self):
         self.setup_with_file(self.setup_file)
         assert self.conf_is_correct
 
+        mr = self.get_mr()
+        assert mr.env_prefix == 'ALIGNAK_'
+
 
 class TestMacroResolverWithoutEnv(MacroResolverTester, AlignakTest):
     """Test without enabled environment macros"""
@@ -936,3 +943,6 @@ def setUp(self):
         self.setup_file = 'cfg/cfg_macroresolver_environment.cfg'
         self.setup_with_file(self.setup_file)
         assert self.conf_is_correct
+
+        mr = self.get_mr()
+        assert mr.env_prefix == 'NAGIOS_'

tests_integ/test_daemons_api.py

@@ -1388,7 +1388,7 @@ def test_get_stats(self):
         # 2/ get the daemons statistics - no details
         self._get_stats(req, satellite_map, False)
 
-        time.sleep(5)
+        time.sleep(1)
 
         # -----
         # 3/ once again, get the daemons statistics - with more details

tests_integ/test_launch_arbiter.py

@@ -91,7 +91,7 @@ def _stop_daemons(self, daemon_names=None):
         for name, port in list(satellite_map.items()):
             if daemon_names and name not in daemon_names:
                 continue
-            print("- stopping %s: http://127.0.0.1:%s/stop_request" % (name, port))
+            print("- stopping (now) %s: http://127.0.0.1:%s/stop_request" % (name, port))
             raw_data = self.req.get("http://127.0.0.1:%s/stop_request?stop_now=1" % (port))
             data = raw_data.json()
             print("- response = %s" % data)
@@ -328,7 +328,7 @@ def test_arbiter_daemons_kill_one_daemon(self):
             cfg.read(['/tmp/alignak/etc/alignak.ini', '/tmp/alignak/etc/alignak.d/daemons.ini'])
             cfg.set('alignak-configuration', 'launch_missing_daemons', '1')
             cfg.set('alignak-configuration', 'polling_interval', '1')
-            cfg.set('alignak-configuration', 'daemons_check_period', '1')
+            cfg.set('alignak-configuration', 'daemons_check_period', '3')
             cfg.set('alignak-configuration', 'daemons_stop_timeout', '1')
             cfg.set('alignak-configuration', 'daemons_start_timeout', '1')
             cfg.set('alignak-configuration', 'daemons_new_conf_timeout', '1')
@@ -361,9 +361,11 @@ def test_arbiter_daemons_kill_one_daemon(self):
         print("Started...")
 
         self._ping_daemons()
+        sleep(1)
 
         print("Killing one daemon process...")
         self._stop_daemons(['receiver'])
+        sleep(1)
         self._ping_daemons()
         sleep(2)