Allow a module to be related with other modules (restoring this feature if any portable module require this)

Author: mohierf

alignak/modulesmanager.py

@@ -74,6 +74,7 @@ def __init__(self, daemon):
         self.daemon = daemon
         self.daemon_type = daemon.type
         self.daemon_name = daemon.name
+        self.modules = {}
         self.modules_assoc = []
         self.instances = []
         self.to_restart = []
@@ -136,6 +137,7 @@ def load(self, modules):
                                                      "function" % module.python_name)
                     raise AttributeError
 
+                self.modules[module.uuid] = module
                 self.modules_assoc.append((module, python_module))
                 logger.info("Imported '%s' for %s", module.python_name, module.name)
             except ImportError as exp:  # pragma: no cover, simple protection
@@ -233,6 +235,13 @@ def get_instances(self):
             alignak_module.properties = python_module.properties.copy()
             alignak_module.my_daemon = self.daemon
             logger.info("Alignak starting module '%s'", alignak_module.get_name())
+            logger.info("Alignak starting module '%s'", getattr(alignak_module, 'modules', None))
+            if getattr(alignak_module, 'modules', None):
+                modules = []
+                for module_uuid in alignak_module.modules:
+                    if module_uuid in self.modules:
+                        modules.append(self.modules[module_uuid])
+                alignak_module.modules = modules
             logger.debug("Module '%s', parameters: %s",
                          alignak_module.get_name(), alignak_module.__dict__)
             try:

alignak/objects/host.py

@@ -171,7 +171,7 @@ class Host(SchedulingItem):  # pylint: disable=R0904
 
         # Realm stuff
         'realm_name':
-            StringProp(default=u''),
+            StringProp(default=u'', fill_brok=['full_status']),
         'got_default_realm':
             BoolProp(default=False),
 

alignak/objects/module.py

@@ -87,9 +87,9 @@ class Module(Item):
         # Old "deprecated" property - replaced with type
         'module_types':
             ListProp(default=[u''], split_on_comma=True),
-        # Do not manage modules having modules
-        # 'modules':
-        #     ListProp(default=[''], split_on_comma=True)
+        # Allow a module to be related some other modules
+        'modules':
+            ListProp(default=[''], split_on_comma=True),
 
         # Module log level
         'log_level':
@@ -128,9 +128,9 @@ def __init__(self, params=None, parsing=True):
             # Old "deprecated" property - replaced with type
             'module_types':
                 ListProp(default=[''], split_on_comma=True),
-            # Do not manage modules having modules
-            # 'modules':
-            #     ListProp(default=[''], split_on_comma=True)
+            # Allow a module to be related some other modules
+            'modules':
+                ListProp(default=[''], split_on_comma=True),
 
             'enabled':
                 BoolProp(default=True),
@@ -237,9 +237,29 @@ class Modules(Items):
     inner_class = Module
 
     def linkify(self):
-        """Link modules
+        """Link a module to some other modules
 
         :return: None
         """
-        warnings.warn("Linking modules to modules (%s) is not managed by Alignak.".format(s=self),
-                      DeprecationWarning, stacklevel=2)
+        self.linkify_s_by_plug()
+
+    def linkify_s_by_plug(self):
+        """Link a module to some other modules
+
+        :return: None
+        """
+        for module in self:
+            new_modules = []
+            for related in getattr(module, 'modules', []):
+                related = related.strip()
+                if not related:
+                    continue
+                o_related = self.find_by_name(related)
+                if o_related is not None:
+                    new_modules.append(o_related.uuid)
+                else:
+                    self.add_error("the module '%s' for the module '%s' is unknown!"
+                                   % (related, module.get_name()))
+            module.modules = new_modules
+
+

bin/systemd/default/alignak

@@ -32,3 +32,6 @@
 #ALIGNAK_CONFIGURATION_FILE=/usr/local/etc/my-alignak.ini
 #ALIGNAK_USER=my-alignak
 #ALIGNAK_GROUP=my-alignak
+
+# Uncomment to make the daemons raise some log about its cpu and memory consumption every 10 seconds
+#ALIGNAK_DAEMON_MONITORING=10

setup.py

@@ -61,7 +61,10 @@ def extract_requirement(line):
     ('share/alignak', ['bin/python-post-install.sh',
                        'bin/python3-post-install.sh',
                        'bin/alignak-log-rotate',
-                       'bin/alignak.ico'])
+                       'contrib/images/alignak.ico',
+                       'contrib/images/alignak_128x128.png',
+                       'contrib/images/alignak_blue_logo.png',
+                       'contrib/images/alignak_white_logo.png'])
 ]
 for dir in ['etc', 'bin/manpages/manpages', 'bin/rc.d', 'bin/systemd', 'bin/systemV']:
     for subdir, dirs, files in os.walk(dir):

tests/cfg/modules/alignak_module_with_submodules.cfg

@@ -7,3 +7,13 @@ define module{
     python_name     alignak_module_test
     modules         A,B
 }
+define module{
+    module_alias    A
+    module_types    type
+    python_name     alignak_module_A.module
+}
+define module{
+    module_alias    B
+    module_types    type
+    python_name     alignak_module_B.module
+}

tests/test_aa_properties_default.py

@@ -631,6 +631,7 @@ class TestModule(PropertiesTester, AlignakTest):
         ('type', 'unset'),
         ('daemon', 'unset'),
         ('module_types', ['']),
+        ('modules', ['']),
         ('enabled', True),
         ('log_level', 'INFO'),
         ('statsd_host', 'localhost'),

tests/test_modules.py

@@ -180,41 +180,6 @@ def test_module_on_module(self):
         modules = [m.name for m in self._scheduler_daemon.modules]
         assert modules == ['Example', 'inner-retention']
 
-        s = {
-            'alignak': 'My Alignak', 'type': 'scheduler', 'name': 'scheduler-master',
-            'version': '2.0.0rc3', 'program_start': 1535113067.5402572, 'spare': False,
-            'load': -41.431089073425724,
-            'counters': {'modules': 0, 'external-commands': 0, 'satellites.arbiters': 0,
-                         'satellites.schedulers': 0, 'brokers': 1, 'pollers': 1, 'reactionners': 1,
-                         'receivers': 0, 'actions.count': 0, 'actions.scheduled': 1035,
-                         'actions.in_poller': 0, 'actions.zombie': 0, 'checks.count': 1043,
-                         'checks.scheduled': 1035, 'checks.in_poller': 0, 'checks.zombie': 0},
-            'metrics': [], 'modules': {'internal': {}, 'external': {}},
-            'monitored_objects': {'timeperiods': 4, 'services': 40, 'servicegroups': 1,
-                                  'commands': 11, 'hosts': 1016, 'hostgroups': 2, 'contacts': 2,
-                                  'contactgroups': 2, 'notificationways': 2, 'checkmodulations': 0,
-                                  'macromodulations': 0, 'servicedependencies': 0,
-                                  'hostdependencies': 0, 'arbiters': 0, 'schedulers': 0,
-                                  'reactionners': 0, 'brokers': 0, 'receivers': 0, 'pollers': 0,
-                                  'realms': 0, 'modules': 0, 'resultmodulations': 0,
-                                  'businessimpactmodulations': 0, 'escalations': 0,
-                                  'serviceescalations': 0, 'hostescalations': 0, 'hostsextinfo': 0,
-                                  'servicesextinfo': 0}, '_freshness': 1535113164,
-            'latency': {'avg': 0.74, 'min': 0.74, 'max': 0.74},
-            'livesynthesis': {'hosts_total': 1016, 'hosts_not_monitored': 10, 'hosts_up_hard': 1015,
-                              'hosts_up_soft': 0, 'hosts_down_hard': 0, 'hosts_down_soft': 1,
-                              'hosts_unreachable_hard': 0, 'hosts_unreachable_soft': 0,
-                              'hosts_acknowledged': 0, 'hosts_in_downtime': 0, 'hosts_flapping': 0,
-                              'services_total': 40, 'services_not_monitored': 0,
-                              'services_ok_hard': 40, 'services_ok_soft': 0,
-                              'services_warning_hard': 0, 'services_warning_soft': 0,
-                              'services_critical_hard': 0, 'services_critical_soft': 0,
-                              'services_unknown_hard': 0, 'services_unknown_soft': 0,
-                              'services_unreachable_hard': 0, 'services_unreachable_soft': 0,
-                              'services_acknowledged': 0, 'services_in_downtime': 0,
-                              'services_flapping': 0}
-        }
-
     def test_modulemanager_1(self):
         """ Module manager manages its modules - old form