LinuxMonitor 1.3.9__tar.gz → 1.3.11__tar.gz

{linuxmonitor-1.3.9 → linuxmonitor-1.3.11/LinuxMonitor.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: LinuxMonitor
-Version: 1.3.9
+Version: 1.3.11
 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.9/LinuxMonitor.egg-info → linuxmonitor-1.3.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: LinuxMonitor
-Version: 1.3.9
+Version: 1.3.11
 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.9 → linuxmonitor-1.3.11}/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.9 (2024/09/19)"
+__version__ = "1.3.11 (2024/09/23)"
 __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
@@ -196,6 +198,9 @@ class LinuxMonitor:
         md: str = ""
         indent: str = "  " * level  # type: ignore # Indentation for markdown headings
 
+        # Preprocess the input to convert single quotes to double quotes
+        json_string = re.sub(r"'", '"', json_string)
+
         # Parse the JSON string to a Python object
         try:
             data = json.loads(json_string)
@@ -212,11 +217,13 @@ class LinuxMonitor:
                     md += f"{indent}- {key}\n"
                     process_data(value, level + 1) # type: ignore
             elif isinstance(data, list):
-                for index, item in enumerate(data): # type: ignore
-                    md += f"{indent}- Item {index + 1}\n"
-                    process_data(item, level + 1) # type: ignore
+                if not data:  # Show "nothing" for empty lists
+                    md += f"{indent}- Nothing\n"
+                else:
+                    for item in data: # type: ignore
+                        process_data(item, level)  # Skip "Item" label # type: ignore
             else:
-                md += f"{indent}  - {data}\n"
+                md += f"{indent}- {data}\n"
 
         process_data(data, level)
 
@@ -1826,11 +1833,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 = []
@@ -1919,7 +1923,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"
@@ -1957,7 +1963,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.9 → linuxmonitor-1.3.11}/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.9",
+    version="1.3.11",
     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",