LinuxMonitor 1.3.2__tar.gz → 1.3.4__tar.gz

{linuxmonitor-1.3.2 → linuxmonitor-1.3.4/LinuxMonitor.egg-info}/PKG-INFO

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: LinuxMonitor
-Version: 1.3.2
+Version: 1.3.4
 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.2 → linuxmonitor-1.3.4}/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.2 (2024/09/19)"
+__version__ = "1.3.4 (2024/09/19)"
 __status__ = "Usable for any Linux project"
 
 import json
@@ -235,13 +235,13 @@ class LinuxMonitor:
             # Command returned an error code
             if not show_only_std_and_exception:
                 out_msg = f"❌ **Error {display_name}**\n"
-            out_msg += f" - Error code: `{returncode}`"
+            out_msg += f"  - Error code: `{returncode}`"
 
             if stderr_str != "":
-                out_msg += f"\n - Error log:\n```sh\n{stderr_str}\n```"
+                out_msg += f"\n  - Error log:\n```sh\n{stderr_str}\n```"
 
             if stdout_str != "":
-                out_msg += f"\n - Info:\n```sh\n{stdout_str}\n```"
+                out_msg += f"\n  - Info:\n```sh\n{stdout_str}\n```"
         elif res == None:
             # Command timed out
             if not show_only_std_and_exception:
@@ -302,9 +302,9 @@ class LinuxMonitor:
             percent_used: float = (used / total) * 100
             if critical_disk_percent != -1 and percent_used > critical_disk_percent:
                 out_msg = f"- 🚨 Critical disk {display_name} (`{disk_path}`) space:\n" \
-                        f" - Total: {total_gb:.2f}GB\n" \
-                        f" - Used: {used_gb:.2f}GB ({percent_used:.2f}%)\n" \
-                        f" - Free: {free_gb:.2f}GB\n" \
+                        f"  - Total: {total_gb:.2f}GB\n" \
+                        f"  - Used: {used_gb:.2f}GB ({percent_used:.2f}%)\n" \
+                        f"  - Free: {free_gb:.2f}GB\n" \
                         f"⚠️ **Free up disk space** ⚠️"
                 logging.warning(msg=out_msg)
             elif not display_only_if_critical:
@@ -409,8 +409,8 @@ class LinuxMonitor:
 
             if critical_usage_giga > 0 and total_used_bytes >= critical_usage_giga * (2**30):
                 out_msg = f"- 🚨 Critical folder {display_name} space (`{folder_path}`):\n" \
-                        f" - Total allowed: {critical_usage_giga:.2f}GB\n" \
-                        f" - Used: {total_used_giga:.2f}GB ({percent_used:.2f}%)\n" \
+                        f"  - Total allowed: {critical_usage_giga:.2f}GB\n" \
+                        f"  - Used: {total_used_giga:.2f}GB ({percent_used:.2f}%)\n" \
                         f"⚠️ **Please free up space in this folder** ⚠️"
                 logging.warning(msg=out_msg)
             elif not display_only_if_critical:
@@ -880,7 +880,7 @@ class LinuxMonitor:
 
                     if not res and service_name_to_restart != "":
                         restart_msg = await self.restart_service(is_private=is_private, service_name=service_name_to_restart, force_restart=False)
-                        out_msg += f"\n - {restart_msg}"
+                        out_msg += f"\n  - {restart_msg}"
 
             if out_msg != "":
                 out_msg = f"# 🌐 Website access state 🌐\n{out_msg}"
@@ -915,17 +915,17 @@ class LinuxMonitor:
                     out_msg += "\n"
                 out_msg += f"- `{service_name}`: {service['display_name']}:\n"
                 if not is_allowed_to_restart:
-                    out_msg += " - ❌ Not authorized to restart (no 'restart_command')\n"
+                    out_msg += "  - ❌ Not authorized to restart (no 'restart_command')\n"
                 else:
                     if auto_restart:
-                        out_msg += " - ✅ Can be restarted (automatically & manually)\n"
+                        out_msg += "  - ✅ Can be restarted (automatically & manually)\n"
                     else:
-                        out_msg += " - ✅ Can be restarted (manually only because 'auto_restart' = false)\n"
+                        out_msg += "  - ✅ Can be restarted (manually only because 'auto_restart' = false)\n"
 
                 if is_allowed_to_stop:
-                    out_msg += " - ✅ Can be stopped manually"
+                    out_msg += "  - ✅ Can be stopped manually"
                 else:
-                    out_msg += " - ❌ Not authorized to stop manually (no 'stop_command')"
+                    out_msg += "  - ❌ Not authorized to stop manually (no 'stop_command')"
 
         if out_msg != "":
             out_msg = f"# 🔄 Services list 🔄\n{out_msg}"
@@ -1049,7 +1049,7 @@ class LinuxMonitor:
             res, out_msg = await self.execute_and_verify(command=status_command, display_name=f"état de {display_name}", show_only_std_and_exception=True, timeout_in_sec=timeout_in_sec, display_only_if_critical=False, check_also_stdout_not_containing=check_also_stdout_not_containing)
             return res, out_msg
         except Exception as e:
-            out_msg = f"⚠️ **Error checking status of service {service_name}**:\n```sh\n{e}\n```"
+            out_msg = f"  - ⚠️ **Error checking status of service {service_name}**:\n```sh\n{e}\n```"
             logging.exception(msg=out_msg)
             return None, out_msg
 
@@ -1089,10 +1089,10 @@ class LinuxMonitor:
                             out_msg += "\n"
                         out_msg += f"- {service_icon} {self.config['services'][service_name]['display_name']}: **{service_status}**"
                         if status != True and status_msg != "":
-                            out_msg += f"\n - {status_msg}"
+                            out_msg += f"\n{status_msg}"
 
                         if status is False:
-                            out_msg += f"\n - " + await self.restart_service(is_private=is_private, service_name=service_name, force_restart=False)
+                            out_msg += f"\n  - " + await self.restart_service(is_private=is_private, service_name=service_name, force_restart=False)
 
         except Exception as e:
             out_msg = f"**Internal error checking services status**:\n```sh\n{e}\n```"
@@ -1236,14 +1236,14 @@ class LinuxMonitor:
 
             if not cert_infos["is_valid"]:
                 out_msg = f"- ❌ **Invalid SSL certificate [{display_name}](https://{hostname})**\n" \
-                        f" - **Certificate expired on {expiry_date.strftime('%d/%m/%Y')}**\n" \
-                        f" - **Renew the SSL certificate immediately**"
+                        f"  - **Certificate expired on {expiry_date.strftime('%d/%m/%Y')}**\n" \
+                        f"  - **Renew the SSL certificate immediately**"
                 logging.warning(msg=out_msg)
             elif critical_remaining_days > 0 and remaining_days < critical_remaining_days:
                 out_msg = f"- ⚠️ **SSL certificate [{display_name}](https://{hostname}) will expire soon**:\n" \
-                        f" - Certificate expires on {expiry_date.strftime('%d/%m/%Y')}\n" \
-                        f" - **{remaining_days} remaining days (which is in less than {critical_remaining_days} days)**\n" \
-                        f" - **Renew the SSL certificate quickly**"
+                        f"  - Certificate expires on {expiry_date.strftime('%d/%m/%Y')}\n" \
+                        f"  - **{remaining_days} remaining days (which is in less than {critical_remaining_days} days)**\n" \
+                        f"  - **Renew the SSL certificate quickly**"
                 logging.warning(msg=out_msg)
             elif not display_only_if_critical:
                 if warning_remaining_days > 0 and remaining_days < warning_remaining_days:
@@ -1258,7 +1258,7 @@ class LinuxMonitor:
 
             # Display the error of retrieving the certificate if there is one
             if cert_infos["error"]:
-                out_msg += f"\n - Reason: `{cert_infos['error']}`"
+                out_msg += f"\n  - Reason: `{cert_infos['error']}`"
         except Exception as e:
             out_msg = f"- ⚠️ **Error checking SSL certificate of [{display_name}](https://{hostname})**:\n```sh\n{e}\n```"
             logging.exception(msg=out_msg)
@@ -1596,7 +1596,7 @@ class LinuxMonitor:
                             out_msg += "\n"
 
                         restart_res: str = await self.restart_service(is_private=is_private, service_name=service_name_to_restart, force_restart=False)
-                        out_msg += f" - {restart_res}"
+                        out_msg += f"  - {restart_res}"
 
             if out_msg != "":
                 out_msg = f"# 🛡️ Ports 🛡️\n{out_msg}"

{linuxmonitor-1.3.2 → linuxmonitor-1.3.4}/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.2",
+    version="1.3.4",
     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",