LinuxMonitor 1.5.3__tar.gz → 1.5.5__tar.gz

{linuxmonitor-1.5.3 → linuxmonitor-1.5.5/LinuxMonitor.egg-info}/PKG-INFO

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: LinuxMonitor
-Version: 1.5.3
+Version: 1.5.5
 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.3 → linuxmonitor-1.5.5}/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.3 (2024/10/27)"
+__version__ = "1.5.5 (2024/10/27)"
 __status__ = "Usable for any Linux project"
 
 import json
@@ -435,7 +435,7 @@ class LinuxMonitor:
 
     def _get_folder_size_in_bytes(self, start_path: str = '.') -> float:
         """
-        Get the size of a folder in bytes.
+        Get the size of a folder in bytes, including hard-linked files only once.
 
         :param start_path: The path to the folder.
 
@@ -443,13 +443,23 @@ class LinuxMonitor:
         """
         try:
             total_size = 0
+            seen_inodes: set[int] = set()  # Track inodes to avoid double-counting hard-linked files
+
             for dirpath, _, filenames in os.walk(start_path):
                 for f in filenames:
                     fp = os.path.join(dirpath, f)
+                    try:
+                        # Get file information
+                        stat_info = os.stat(fp)
+                        inode = stat_info.st_ino
+
+                        # Include file size only if we haven't seen this inode before
+                        if inode not in seen_inodes:
+                            seen_inodes.add(inode)
+                            total_size += stat_info.st_size
+                    except FileNotFoundError:
+                        logging.warning(f"File {fp} not found. It may be a broken link.")
 
-                    # Skip if it is symbolic link
-                    if not os.path.islink(fp):
-                        total_size += os.path.getsize(fp)
             logging.info(msg=f"Total size of folder {start_path}: {total_size} bytes")
             return total_size
         except Exception as e:
@@ -587,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)
 
@@ -599,9 +613,9 @@ 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" + asyncio.run(self.get_ordered_processes(get_non_consuming_processes=False, order_by_ram=False, max_processes=10)) # type: ignore
 
-                logging.warning(msg=out_msg)
+                logging.warning(msg=out_msg) # type: ignore
             elif not display_only_if_critical:
                 if cpu_percent >= self.warning_cpu_percent:
                     icon = "⚠️"
@@ -628,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)
@@ -638,9 +656,9 @@ 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" + asyncio.run(self.get_ordered_processes(get_non_consuming_processes=False, order_by_ram=True, max_processes=10)) # type: ignore
 
-                logging.warning(msg=out_msg)
+                logging.warning(msg=out_msg) # type: ignore
             elif not display_only_if_critical:
                 if percent_ram >= self.warning_ram_percent:
                     icon = "⚠️"
@@ -667,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)
@@ -680,9 +702,9 @@ 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" + asyncio.run(self.get_ordered_processes(get_non_consuming_processes=False, order_by_ram=False, max_processes=10)) # type: ignore
 
-                logging.warning(msg=out_msg)
+                logging.warning(msg=out_msg) # type: ignore
             elif not display_only_if_critical:
                 if avg_load_avg >= self.warning_load_average_percent:
                     icon = "⚠️"
@@ -709,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)
@@ -1548,7 +1574,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,
@@ -2537,6 +2563,14 @@ class LinuxMonitor:
                             out_msg += "\n"
                         out_msg += msg
 
+                # Load average
+                if is_private:
+                    msg = 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)

{linuxmonitor-1.5.3 → linuxmonitor-1.5.5}/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.3",
+    version="1.5.5",
     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",