Merge branch 'ent-9741-autodiscover-is-enabled-in-the-default-config-even-though-autodiscover-is-not-operating' into 'develop'

ent-9741-autodiscover-is-enabled-in-the-default-config-even-though-autodiscover-is-not-operating

See merge request artica/pandorafms!5275

pandora_agents/unix/plugins/autodiscover

@@ -12,8 +12,8 @@
 #
 ###################################################
 
+try:
     from sys import argv
-from sys import path
     from sys import stderr
     from sys import exit
     from subprocess import Popen
@@ -21,10 +21,12 @@ from subprocess import PIPE
     from subprocess import DEVNULL
     from subprocess import getstatusoutput
     import psutil
+except ModuleNotFoundError as err:
+    print("{} error: {}. Exiting...".format(argv[0], err), file=stderr)
+    exit(1)
 
-global module_list
 module_list = []
-version = "1.1"
+VERSION = "1.2"
 
 
 #########################################################################################
@@ -50,15 +52,15 @@ class PSCheck:
                     procname = PSCheck.get_serviceprocess(element)
                     # Get process status
                     parstatus = PSCheck.getstatus(element)
-                    if memcpu == True and parstatus == 1:
+                    if memcpu and parstatus == 1:
                         usage = get_memcpu(str(procname), str(element))
                         output += usage
                     # Generate module with name and status
                     parent = service_module(str(element), parstatus)
                     output += parent
-                    if option == True:
+                    if option:
                         children = PSCheck.getchildren(element, memcpu)
-                        if type(children) == list and len(children) > 1:
+                        if isinstance(children, list) and len(children) > 1:
                             for child in children:
                                 output += child
                         else:
@@ -66,7 +68,6 @@ class PSCheck:
                 else:
                     next
 
-            #if output != '':
             if output and element and procname:
                 return ({"name" : element, "process" : procname, "modules": output})
             else:
@@ -84,13 +85,13 @@ class PSCheck:
             status = PSCheck.getstatus(child)
             kids += service_module(str(child), status, "Service " + str(servicename) + " - Status")
             if status:
-                if memcpu == True:
+                if memcpu:
                     kidsusage = get_memcpu(str(child))
                     for usage in kidsusage:
                         kids += usage
             else:
                 next
-        return (kids)
+        return kids
 
     @staticmethod
     def getstatus(servicename):
@@ -99,7 +100,7 @@ class PSCheck:
                 "' |", "Select-Object", "-ExpandProperty", "Status"],
                 stdout=PIPE, stdin=DEVNULL, stderr=DEVNULL, universal_newlines=True)
         status = running.communicate()[0].strip()
-        return (int(status == "Running"))
+        return int(status == "Running")
 
     @staticmethod
     def get_serviceprocess(servicename):
@@ -108,7 +109,7 @@ class PSCheck:
         srv_pid = service.pid()
         process = psutil.Process(srv_pid)
         proc_name = process.name()
-        return (proc_name)
+        return proc_name
 
 
 #########################################################################################
@@ -124,13 +125,13 @@ def service_module(name, value, parent=None):
             "module_parent"     :   parent,
         }]
     #print ("service_module END "+str(now(0,1)))
-    return (module)
+    return module
 
-def get_memcpu (process, servicename):
+def get_memcpu (process, servicename=None):
     """Creates a module for Memory and CPU for a given process. Returns a list of dictionaries."""
     modules = []
     if process:
-        if servicename != None:
+        if servicename is not None:
             parentname = servicename
         else:
             parentname = process
@@ -147,7 +148,7 @@ def get_memcpu (process, servicename):
                 "unit"          :     "%",
                 "module_parent" :    "Service "+ parentname + " - Status",
                 }]
-    return (modules)
+    return modules
 
 def proc_percentbyname(procname): ############# 03/03/2020
     """Gets Memory and CPU usage for a given process. Returns a list."""
@@ -165,7 +166,7 @@ def proc_percentbyname(procname): ############# 03/03/2020
     except psutil.NoSuchProcess:
         next
     #print ("proc_percentbyname END "+str(now(0,1)))
-    return ([sum(memory),sum(cpu)])
+    return [sum(memory),sum(cpu)]
 
 def win_service(servicelist, option=False, memcpu=False):
     """Creates modules for Windows servers."""
@@ -173,7 +174,7 @@ def win_service(servicelist, option=False, memcpu=False):
     for srvc in servicelist:
         if srvc and len(srvc) > 2:
             output = PSCheck.check_service(srvc, option, memcpu)
-            if output != None and output["modules"]:
+            if output is not None and output["modules"]:
                 modules += PSCheck.check_service(srvc.strip(), option, memcpu)["modules"]
                 module_list.append(srvc)
                 #winprocess = output["name"]
@@ -227,7 +228,7 @@ def lnx_service(services_list, memcpu=False):
             exit()
         if status:
             module_list.append(srvc)
-            if memcpu == True:
+            if memcpu:
                 modules += get_memcpu(srvc, None)
     
     for m in modules:
@@ -383,7 +384,7 @@ def discover(osyst, servicelist):
         elif osyst == "Linux":
             lnx_service(servicelist, memcpu)
     else:
-        print ("\nPandora FMS Autodiscovery plugin v{}".format(version))
+        print("\nPandora FMS Autodiscovery plugin v{}".format(VERSION))
         print("Checks the status of the services in list and monitors CPU and Memory for each of them.\n")
         print("Usage:")
         print("{} [options] [--usage]".format(argv[0]))