LinuxMonitor 1.4.8__tar.gz → 1.5.0__tar.gz

{linuxmonitor-1.4.8 → linuxmonitor-1.5.0/LinuxMonitor.egg-info}/PKG-INFO

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: LinuxMonitor
-Version: 1.4.8
+Version: 1.5.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.4.8 → linuxmonitor-1.5.0}/linuxmonitor/__main__.py

@@ -71,6 +71,7 @@ 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"

{linuxmonitor-1.4.8 → linuxmonitor-1.5.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.4.8 (2024/10/27)"
+__version__ = "1.5.0 (2024/10/27)"
 __status__ = "Usable for any Linux project"
 
 import json
@@ -106,6 +106,14 @@ class LinuxMonitor:
         if not isinstance(basic_config, dict):
             raise ValueError("The basic configuration must be a dictionary")
 
+        if 'warning_load_average_percent' not in basic_config:
+            raise ValueError("The basic configuration must contain the 'warning_load_average_percent' key")
+        self.warning_load_average_percent: float = basic_config.get('warning_load_average_percent') # type: ignore
+
+        if 'critical_load_average_percent' not in basic_config:
+            raise ValueError("The basic configuration must contain the 'critical_load_average_percent' key")
+        self.critical_load_average_percent: float = basic_config.get('critical_load_average_percent') # type: ignore
+
         if 'warning_cpu_percent' not in basic_config:
             raise ValueError("The basic configuration must contain the 'warning_cpu_percent' key")
         self.warning_cpu_percent: float = basic_config.get('warning_cpu_percent') # type: ignore
@@ -587,15 +595,15 @@ class LinuxMonitor:
             cpu_cores: int = psutil.cpu_count(logical=False)
             cpu_name: str = self._get_cpu_name()
 
-            if cpu_percent > self.critical_cpu_percent:
+            if cpu_percent >= self.critical_cpu_percent:
                 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" + 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:
-                if cpu_percent > self.warning_cpu_percent:
+                if cpu_percent >= self.warning_cpu_percent:
                     icon = "⚠️"
                 else:
                     icon = "✅"
@@ -626,15 +634,15 @@ class LinuxMonitor:
             used_ram: float = ram.used / (2**30)
             free_ram: float = total_ram - used_ram
             percent_ram: float = ram.percent
-            if percent_ram > self.critical_ram_percent:
+            if percent_ram >= self.critical_ram_percent:
                 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" + 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_ram > self.warning_ram_percent:
+                if percent_ram >= self.warning_ram_percent:
                     icon = "⚠️"
                 else:
                     icon = "✅"
@@ -649,6 +657,45 @@ class LinuxMonitor:
 
         return out_msg
 
+    def check_load_average(self, display_only_if_critical: bool=False) -> str:
+        """
+        Check the load average.
+
+        :param display_only_if_critical: If True, the string result will only be returned if there is an error during execution.
+
+        :return: A string containing the result message.
+        """
+        out_msg: str = ""
+        try:
+            # Getting load average
+            load_avg = psutil.getloadavg()
+
+            # Getting an average of all 3 values
+            avg_load_avg: float = sum(load_avg) / len(load_avg)
+
+            if avg_load_avg >= self.critical_load_average_percent:
+                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)
+
+                logging.warning(msg=out_msg)
+            elif not display_only_if_critical:
+                if avg_load_avg >= self.warning_load_average_percent:
+                    icon = "⚠️"
+                else:
+                    icon = "✅"
+                out_msg = f"- {icon} **{avg_load_avg:.2f}%**"
+                logging.info(msg=out_msg)
+        except Exception as e:
+            out_msg = f"- ⚠️ **Error getting load average**:\n```sh\n{e}\n```"
+            logging.exception(msg=out_msg)
+
+        if out_msg != "":
+            out_msg = f"# 📈 Load Average 📈\n{out_msg}"
+
+        return out_msg
+
     def check_swap_usage(self, display_only_if_critical: bool=False) -> str:
         """
         Check the SWAP usage.
@@ -665,11 +712,11 @@ class LinuxMonitor:
             used_swap: float = swap.used / (2**30)
             free_swap: float = swap.free / (2**30)
             percent_swap: float = swap.percent
-            if percent_swap > self.critical_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** ⚠️"
                 logging.warning(msg=out_msg)
             elif not display_only_if_critical:
-                if percent_swap > self.warning_swap_percent:
+                if percent_swap >= self.warning_swap_percent:
                     icon = "⚠️"
                 else:
                     icon = "✅"
@@ -715,11 +762,11 @@ class LinuxMonitor:
             max_temp = max(temp.current for temp in cpu_temps) # type: ignore
 
             # Vérifier la température par rapport au seuil critique
-            if max_temp > self.critical_temperature_celsius:
+            if max_temp >= self.critical_temperature_celsius:
                 out_msg = f"- 🚨 **Critical CPU temperature**:\n- {max_temp:.2f}°C\n- Critical threshold: {self.critical_temperature_celsius}°C\n⚠️ **Check the CPU cooling system** ⚠️"
                 logging.warning(msg=out_msg)
             elif not display_only_if_critical:
-                if max_temp > self.warning_temperature_celsius:
+                if max_temp >= self.warning_temperature_celsius:
                     icon = "⚠️"
                 else:
                     icon = "✅"
@@ -2048,6 +2095,7 @@ class LinuxMonitor:
 
         datetime_last_disk_usage_error_displayed: Optional[datetime] = None
         datetime_last_folder_usage_error_displayed: Optional[datetime] = None
+        datetime_last_load_average_error_displayed: Optional[datetime] = None
         datetime_last_cpu_usage_error_displayed: Optional[datetime] = None
         datetime_last_ram_usage_error_displayed: Optional[datetime] = None
         datetime_last_swap_usage_error_displayed: Optional[datetime] = None
@@ -2071,6 +2119,28 @@ class LinuxMonitor:
             logging.info(msg="-----------------------------------------------")
             logging.info(msg="Checking services status and all disk usage, CPU, RAM, Swap, CPU temperature and ping of websites periodically...")
             try:
+                # Load average
+                if is_private:
+                    msg = 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):
+                            if out_msg != "":
+                                out_msg += "\n"
+                            out_msg += msg
+                            datetime_last_load_average_error_displayed = datetime.now()
+                        else:
+                            logging.warning(msg="Load average critical but already notified less than 12 hours ago, not notifying...")
+                    elif datetime_last_load_average_error_displayed is not None:
+                        msg = "✅ **Load average returned to normal state**"
+                        logging.info(msg=msg)
+                        if out_msg != "":
+                            out_msg += "\n"
+                        out_msg += msg
+                        datetime_last_load_average_error_displayed = None
+                    else:
+                        logging.info(msg="- ✅ Load average is OK.")
+
                 # CPU
                 if is_private:
                     msg = self.check_cpu_usage(display_only_if_critical=True)

{linuxmonitor-1.4.8 → linuxmonitor-1.5.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.4.8",
+    version="1.5.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",