LinuxMonitor 1.3.10__tar.gz → 1.4.0__tar.gz

{linuxmonitor-1.3.10 → linuxmonitor-1.4.0/LinuxMonitor.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: LinuxMonitor
-Version: 1.3.10
+Version: 1.4.0
 Summary: Get information and warning status of Linux server like service, port, ping, ssl certificate, disk/folder/cpu/ram/swap usage, ip connection, ... (Python and shell library, Linux ONLY)
 Home-page: https://github.com/QuentinCG/Linux-Monitor-Python-Library
 Author: Quentin Comte-Gaz

{linuxmonitor-1.3.10/LinuxMonitor.egg-info → linuxmonitor-1.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: LinuxMonitor
-Version: 1.3.10
+Version: 1.4.0
 Summary: Get information and warning status of Linux server like service, port, ping, ssl certificate, disk/folder/cpu/ram/swap usage, ip connection, ... (Python and shell library, Linux ONLY)
 Home-page: https://github.com/QuentinCG/Linux-Monitor-Python-Library
 Author: Quentin Comte-Gaz

{linuxmonitor-1.3.10 → linuxmonitor-1.4.0}/linuxmonitor/__main__.py

@@ -180,7 +180,7 @@ def main() -> None:
     if args.list_processes:
         handled = True
         print("Listing active processes...")
-        out_msg: str = monitoring.get_ordered_processes(get_non_consuming_processes=False)
+        out_msg: str = asyncio.run(monitoring.get_ordered_processes(get_non_consuming_processes=False))
         print(out_msg)
 
     if args.kill_process is not None:

{linuxmonitor-1.3.10 → linuxmonitor-1.4.0}/linuxmonitor/linuxmonitor.py

@@ -33,7 +33,7 @@ __email__ = "quentin@comte-gaz.com"
 __license__ = "MIT License"
 __copyright__ = "Copyright Quentin Comte-Gaz (2024)"
 __python_version__ = "3.+"
-__version__ = "1.3.10 (2024/09/23)"
+__version__ = "1.4.0 (2024/10/07)"
 __status__ = "Usable for any Linux project"
 
 import json
@@ -146,6 +146,8 @@ class LinuxMonitor:
             raise ValueError("The basic configuration must contain the 'warning_uptime_seconds' key")
         self.warning_uptime_seconds: int = basic_config.get('warning_uptime_seconds') # type: ignore
 
+        self.excluded_interfaces: List[str] = basic_config.get('excluded_interfaces', []) # type: ignore
+
         # Get the scheduled tasks for issues configuration
         if self.allow_scheduled_tasks_check_for_issues:
             schedule_check_for_issues_config: Dict[str, Any] = self.config.get('scheduled_tasks_check_for_issues', {}) # type: ignore
@@ -1670,7 +1672,7 @@ class LinuxMonitor:
 
     #region Processes
 
-    def get_ordered_processes(self, get_non_consuming_processes: bool = False) -> str:
+    async def get_ordered_processes(self, get_non_consuming_processes: bool = False) -> str:
         """
         Get the ordered list of processes by memory and CPU usage.
 
@@ -1679,7 +1681,18 @@ class LinuxMonitor:
         :return: A string containing the result message.
         """
         try:
-            processes = []
+             processes = []
+
+            # To get meaningful results, we need to ask cpu percent and wait a bit to get valid cpu_percent values on second iteration
+            for dummy_process in psutil.process_iter(['pid', 'name', 'username', 'cpu_percent', 'memory_info', 'create_time', 'cmdline']):
+                try:
+                    # First call to cpu_percent to initialize it
+                    dummy_process.cpu_percent(interval=None)
+                except (psutil.NoSuchProcess, psutil.AccessDenied, psutil.ZombieProcess):
+                    continue
+            await asyncio.sleep(delay=0.1)
+
+            # Then we can get the processes
             for process in psutil.process_iter(['pid', 'name', 'username', 'cpu_percent', 'memory_info', 'create_time', 'cmdline']):
                 try:
                     create_time = datetime.fromtimestamp(process.info['create_time']).strftime("%Y-%m-%d %H:%M:%S")
@@ -1831,11 +1844,8 @@ class LinuxMonitor:
             stats = psutil.net_if_stats()
             network_usage: str = ""
 
-            # List of interfaces to exclude (e.g., local interface)
-            excluded_interfaces = {"lo"}
-
             for interface in interfaces:
-                if interface in excluded_interfaces or interface not in stats:
+                if interface in self.excluded_interfaces or interface not in stats:
                     continue
 
                 ip_addresses = []
@@ -1924,7 +1934,9 @@ class LinuxMonitor:
                         is_content_json: bool = self.config['commands'][command_config_key].get('is_content_json', False)
                         timeout_in_sec: int = self.config['commands'][command_config_key].get('timeout_in_sec', 10)
 
-                        res: str = await self._execute_command(command=command, display_name=display_name, show_content_if_success=show_content_if_success, show_content_if_issue=show_content_if_issue, is_content_json=is_content_json, timeout_in_sec=timeout_in_sec, display_only_if_critical=False)
+                        res: str = await self._execute_command(command=command, display_name=display_name, show_content_if_success=show_content_if_success,
+                                                               show_content_if_issue=show_content_if_issue, is_content_json=is_content_json,
+                                                               timeout_in_sec=timeout_in_sec, display_only_if_critical=False)
                         if res != "":
                             if out_msg != "":
                                 out_msg += "\n"
@@ -1962,7 +1974,9 @@ class LinuxMonitor:
                     if is_scheduled_tasks_for_infos and not self.config['commands'][command_config_key].get('execute_in_scheduled_tasks_for_infos', False):
                         continue
 
-                    res: str = await self._execute_command(command=command, display_name=display_name, show_content_if_success=show_content_if_success, show_content_if_issue=show_content_if_issue, is_content_json=is_content_json, timeout_in_sec=timeout_in_sec, display_only_if_critical=display_only_if_critical)
+                    res: str = await self._execute_command(command=command, display_name=display_name, show_content_if_success=show_content_if_success, # type: ignore
+                                                           show_content_if_issue=show_content_if_issue, is_content_json=is_content_json,
+                                                           timeout_in_sec=timeout_in_sec, display_only_if_critical=display_only_if_critical)
                     if res != "":
                         if out_msg != "":
                             out_msg += "\n"

{linuxmonitor-1.3.10 → linuxmonitor-1.4.0}/setup.py

@@ -6,7 +6,7 @@ with io.open(file='README.md', mode='r', encoding='utf-8') as readme_file:
 
 setup(
     name="LinuxMonitor",
-    version="1.3.10",
+    version="1.4.0",
     description="Get information and warning status of Linux server like service, port, ping, ssl certificate, disk/folder/cpu/ram/swap usage, ip connection, ... (Python and shell library, Linux ONLY)",
     long_description=readme,
     long_description_content_type="text/markdown",