LinuxMonitor 1.5.4__tar.gz → 1.5.6__tar.gz

{linuxmonitor-1.5.4 → linuxmonitor-1.5.6/LinuxMonitor.egg-info}/PKG-INFO

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: LinuxMonitor
-Version: 1.5.4
+Version: 1.5.6
 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.5.4 → linuxmonitor-1.5.6}/linuxmonitor/__main__.py

@@ -71,10 +71,10 @@ def main() -> None:
             out_msg += msg
 
         out_msg += "\n"
-        out_msg += monitoring.check_load_average(display_only_if_critical=False) + "\n"
-        out_msg += monitoring.check_cpu_usage(display_only_if_critical=False) + "\n"
-        out_msg += monitoring.check_ram_usage(display_only_if_critical=False) + "\n"
-        out_msg += monitoring.check_swap_usage(display_only_if_critical=False) + "\n"
+        out_msg += asyncio.run(monitoring.check_load_average(display_only_if_critical=False)) + "\n"
+        out_msg += asyncio.run(monitoring.check_cpu_usage(display_only_if_critical=False)) + "\n"
+        out_msg += asyncio.run(monitoring.check_ram_usage(display_only_if_critical=False)) + "\n"
+        out_msg += asyncio.run(monitoring.check_swap_usage(display_only_if_critical=False)) + "\n"
         out_msg += monitoring.check_cpu_temperature(display_only_if_critical=False) + "\n"
         out_msg += monitoring.get_network_info()
         print(out_msg)

{linuxmonitor-1.5.4 → linuxmonitor-1.5.6}/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.5.4 (2024/10/27)"
+__version__ = "1.5.6 (2024/11/03)"
 __status__ = "Usable for any Linux project"
 
 import json
@@ -587,7 +587,7 @@ class LinuxMonitor:
             logging.exception(msg=f"Error getting CPU name:\n{e}")
             return ""
 
-    def check_cpu_usage(self, display_only_if_critical: bool=False) -> str:
+    async def check_cpu_usage(self, display_only_if_critical: bool=False) -> str:
         """
         Check the CPU usage.
 
@@ -597,6 +597,10 @@ class LinuxMonitor:
         """
         out_msg: str = ""
         try:
+            if display_only_if_critical and self.critical_cpu_percent > 100:
+                # There is no need to check for showing msg only if critical and the critical percentage is greater than the max possible
+                return out_msg
+
             # Getting average CPU usage for the last second
             cpu_percent: float = psutil.cpu_percent(percpu=False)
 
@@ -609,7 +613,7 @@ class LinuxMonitor:
                 out_msg = f"- 🚨 **Critical CPU usage**:\n- **{cpu_percent:.2f}%** used on {cpu_cores} core of {cpu_info:.2f}GHz ({cpu_name})\n⚠️ **Check what is using so much CPU power** ⚠️"
 
                 # If there is a critical CPU usage, we also display the top 10 processes consuming the most CPU
-                out_msg += "\n" + self.get_ordered_processes(get_non_consuming_processes=False, order_by_ram=False, max_processes=10)
+                out_msg += "\n" + await self.get_ordered_processes(get_non_consuming_processes=False, order_by_ram=False, max_processes=10)
 
                 logging.warning(msg=out_msg)
             elif not display_only_if_critical:
@@ -628,7 +632,7 @@ class LinuxMonitor:
 
         return out_msg
 
-    def check_ram_usage(self, display_only_if_critical: bool=False) -> str:
+    async def check_ram_usage(self, display_only_if_critical: bool=False) -> str:
         """
         Check the RAM usage.
 
@@ -638,6 +642,10 @@ class LinuxMonitor:
         """
         out_msg: str = ""
         try:
+            if display_only_if_critical and self.critical_ram_percent > 100:
+                # There is no need to check for showing msg only if critical and the critical percentage is greater than the max possible
+                return out_msg
+
             # Getting RAM usage
             ram = psutil.virtual_memory()
             total_ram: float = ram.total / (2**30)
@@ -648,7 +656,7 @@ class LinuxMonitor:
                 out_msg = f"- 🚨 **Critical RAM usage**:\n- Total: {total_ram:.2f}GB\n- Used: {used_ram:.2f}GB ({percent_ram:.2f}%)\n- Free: {free_ram:.2f}GB\n⚠️ **Check what is using so much RAM** ⚠️"
 
                 # If there is a critical RAM usage, we also display the top 10 processes consuming the most RAM
-                out_msg += "\n" + self.get_ordered_processes(get_non_consuming_processes=False, order_by_ram=True, max_processes=10)
+                out_msg += "\n" + await self.get_ordered_processes(get_non_consuming_processes=False, order_by_ram=True, max_processes=10)
 
                 logging.warning(msg=out_msg)
             elif not display_only_if_critical:
@@ -667,7 +675,7 @@ class LinuxMonitor:
 
         return out_msg
 
-    def check_load_average(self, display_only_if_critical: bool=False) -> str:
+    async def check_load_average(self, display_only_if_critical: bool=False) -> str:
         """
         Check the load average.
 
@@ -677,11 +685,15 @@ class LinuxMonitor:
         """
         out_msg: str = ""
         try:
+            if display_only_if_critical and self.critical_load_average_percent > 100:
+                # There is no need to check for showing msg only if critical and the critical percentage is greater than the max possible
+                return out_msg
+
             # Number of CPU cores
             num_cores: int = psutil.cpu_count()
 
             # Getting load average
-            load_avg: Tuple[float] = psutil.getloadavg()
+            load_avg: Tuple[float] = psutil.getloadavg() # type: ignore
 
             # Getting an average of all 3 values
             avg_load_avg: float = 100 * sum(min(value, num_cores) for value in load_avg) / (len(load_avg) * num_cores)
@@ -690,7 +702,7 @@ class LinuxMonitor:
                 out_msg = f"- 🚨 **High load average**: **{avg_load_avg:.2f}%**\n⚠️ **Check what is causing the high load average** ⚠️"
 
                 # If there is a critical load average, we also display the top 10 processes consuming the most CPU
-                out_msg += "\n" + self.get_ordered_processes(get_non_consuming_processes=False, order_by_ram=False, max_processes=10)
+                out_msg += "\n" + await self.get_ordered_processes(get_non_consuming_processes=False, order_by_ram=False, max_processes=10)
 
                 logging.warning(msg=out_msg)
             elif not display_only_if_critical:
@@ -709,7 +721,7 @@ class LinuxMonitor:
 
         return out_msg
 
-    def check_swap_usage(self, display_only_if_critical: bool=False) -> str:
+    async def check_swap_usage(self, display_only_if_critical: bool=False) -> str:
         """
         Check the SWAP usage.
 
@@ -719,6 +731,10 @@ class LinuxMonitor:
         """
         out_msg: str = ""
         try:
+            if display_only_if_critical and self.critical_swap_percent > 100:
+                # There is no need to check for showing msg only if critical and the critical percentage is greater than the max possible
+                return out_msg
+
             # Getting Swap usage
             swap = psutil.swap_memory()
             total_swap: float = swap.total / (2**30)
@@ -727,6 +743,10 @@ class LinuxMonitor:
             percent_swap: float = swap.percent
             if percent_swap >= self.critical_swap_percent:
                 out_msg = f"- 🚨 **Critical SWAP usage**\n- Total: {total_swap:.2f}GB\n- Used: {used_swap:.2f}GB ({percent_swap:.2f}%)\n- Free: {free_swap:.2f}GB\n⚠️ **Check what is using so much SWAP** ⚠️"
+
+                # If there is a critical SWAP/RAM usage, we also display the top 10 processes consuming the most RAM
+                out_msg += "\n" + await self.get_ordered_processes(get_non_consuming_processes=False, order_by_ram=True, max_processes=10)
+
                 logging.warning(msg=out_msg)
             elif not display_only_if_critical:
                 if percent_swap >= self.warning_swap_percent:
@@ -1558,7 +1578,7 @@ class LinuxMonitor:
 
         try:
             # Fetch the logs since the specified date
-            command: str = f"sudo last --ip --hostlast --time-format iso --since '{past_date}' | grep 'pts/'"
+            command: str = f"sudo last --ip --hostlast --time-format iso --since '{past_date}' | grep 'pts/' || true"
             last_output: str = subprocess.check_output(
                 args=command,
                 shell=True,
@@ -2134,7 +2154,7 @@ class LinuxMonitor:
             try:
                 # Load average
                 if is_private:
-                    msg = self.check_load_average(display_only_if_critical=True)
+                    msg = await self.check_load_average(display_only_if_critical=True)
                     if msg != "":
                         logging.warning(msg=msg)
                         if datetime_last_load_average_error_displayed is None or ((datetime.now() - datetime_last_load_average_error_displayed).total_seconds() > self.max_duration_seconds_showing_same_error_again_in_scheduled_tasks):
@@ -2156,7 +2176,7 @@ class LinuxMonitor:
 
                 # CPU
                 if is_private:
-                    msg = self.check_cpu_usage(display_only_if_critical=True)
+                    msg = await self.check_cpu_usage(display_only_if_critical=True)
                     if msg != "":
                         logging.warning(msg=msg)
                         if datetime_last_cpu_usage_error_displayed is None or ((datetime.now() - datetime_last_cpu_usage_error_displayed).total_seconds() > self.max_duration_seconds_showing_same_error_again_in_scheduled_tasks):
@@ -2178,7 +2198,7 @@ class LinuxMonitor:
 
                 # RAM
                 if is_private:
-                    msg = self.check_ram_usage(display_only_if_critical=True)
+                    msg = await self.check_ram_usage(display_only_if_critical=True)
                     if msg != "":
                         logging.warning(msg=msg)
                         if datetime_last_ram_usage_error_displayed is None or ((datetime.now() - datetime_last_ram_usage_error_displayed).total_seconds() > self.max_duration_seconds_showing_same_error_again_in_scheduled_tasks):
@@ -2200,7 +2220,7 @@ class LinuxMonitor:
 
                 # Swap
                 if is_private:
-                    msg = self.check_swap_usage(display_only_if_critical=True)
+                    msg = await self.check_swap_usage(display_only_if_critical=True)
                     if msg != "":
                         logging.warning(msg=msg)
                         if datetime_last_swap_usage_error_displayed is None or ((datetime.now() - datetime_last_swap_usage_error_displayed).total_seconds() > self.max_duration_seconds_showing_same_error_again_in_scheduled_tasks):
@@ -2547,9 +2567,17 @@ class LinuxMonitor:
                             out_msg += "\n"
                         out_msg += msg
 
+                # Load average
+                if is_private:
+                    msg = await self.check_load_average(display_only_if_critical=False)
+                    if msg != "":
+                        if out_msg != "":
+                            out_msg += "\n"
+                        out_msg += msg
+
                 # CPU
                 if is_private:
-                    msg = self.check_cpu_usage(display_only_if_critical=False)
+                    msg = await self.check_cpu_usage(display_only_if_critical=False)
                     if msg != "":
                         if out_msg != "":
                             out_msg += "\n"
@@ -2557,7 +2585,7 @@ class LinuxMonitor:
 
                 # RAM
                 if is_private:
-                    msg = self.check_ram_usage(display_only_if_critical=False)
+                    msg = await self.check_ram_usage(display_only_if_critical=False)
                     if msg != "":
                         if out_msg != "":
                             out_msg += "\n"
@@ -2565,7 +2593,7 @@ class LinuxMonitor:
 
                 # Swap
                 if is_private:
-                    msg = self.check_swap_usage(display_only_if_critical=False)
+                    msg = await self.check_swap_usage(display_only_if_critical=False)
                     if msg != "":
                         if out_msg != "":
                             out_msg += "\n"

{linuxmonitor-1.5.4 → linuxmonitor-1.5.6}/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.5.4",
+    version="1.5.6",
     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",