LinuxMonitor 1.0.5__tar.gz → 1.1.0__tar.gz

{linuxmonitor-1.0.5 → linuxmonitor-1.1.0/LinuxMonitor.egg-info}/PKG-INFO

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: LinuxMonitor
-Version: 1.0.5
+Version: 1.1.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.0.5 → linuxmonitor-1.1.0}/linuxmonitor/__main__.py

@@ -79,7 +79,7 @@ def main() -> None:
         out_msg: str = monitoring.get_hostname() + "\n"
         out_msg += monitoring.get_os_details() + "\n"
         out_msg += monitoring.get_kernel_version() + "\n"
-        out_msg += monitoring.get_uptime() + "\n"
+        out_msg += monitoring.check_uptime(display_only_if_critical=False) + "\n"
         out_msg += monitoring.get_server_datetime()
         print(out_msg)
 

{linuxmonitor-1.0.5 → linuxmonitor-1.1.0}/linuxmonitor/linuxmonitor.py

@@ -28,7 +28,7 @@ __email__ = "quentin@comte-gaz.com"
 __license__ = "MIT License"
 __copyright__ = "Copyright Quentin Comte-Gaz (2024)"
 __python_version__ = "3.+"
-__version__ = "1.0.5 (2024/09/14)"
+__version__ = "1.1.0 (2024/09/14)"
 __status__ = "Usable for any Linux project"
 
 import json
@@ -129,6 +129,14 @@ class LinuxMonitor:
             raise ValueError("The basic configuration must contain the 'critical_temperature_celsius' key")
         self.critical_temperature_celsius: float = basic_config.get('critical_temperature_celsius') # type: ignore
 
+        if 'critical_uptime_seconds' not in basic_config:
+            raise ValueError("The basic configuration must contain the 'critical_uptime_seconds' key")
+        self.critical_uptime_seconds: int = basic_config.get('critical_uptime_seconds') # type: ignore
+
+        if 'warning_uptime_seconds' not in basic_config:
+            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
+
         # 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
@@ -634,9 +642,11 @@ class LinuxMonitor:
 
         return out_msg
 
-    def get_uptime(self) -> str:
+    def check_uptime(self, display_only_if_critical: bool=False) -> str:
         """
-        Get the system uptime.
+        Check the system uptime.
+
+        :param display_only_if_critical: If True, the string result will only be returned if uptime is less than the critical uptime defined in the configuration.
 
         :return: A string containing the result message.
         """
@@ -652,25 +662,6 @@ class LinuxMonitor:
             # Date de démarrage du système
             boot_time: str = time.strftime("%d/%m/%Y %H:%M:%S", time.localtime(psutil.boot_time()))
 
-            # Funny emoji depending on uptime
-            emoji: str = ""
-            if years >= 2:
-                emoji = "🎂"
-            if years >= 1:
-                emoji = "🎉"
-            elif months >= 6:
-                emoji = "🥳"
-            elif months >= 1:
-                emoji = "😀"
-            elif days >= 1:
-                emoji = "🎊"
-            elif hours >= 1:
-                emoji = "👶"
-            elif minutes >= 20:
-                emoji = "🤔"
-            else:
-                emoji = "☢️"
-
             dispo: str = ""
             if years >= 1:
                 dispo += f"{int(years)} year(s) "
@@ -685,10 +676,37 @@ class LinuxMonitor:
             if seconds >= 1:
                 dispo += f"{int(seconds)}sec "
 
-            out_msg: str = (f"# 🕒 System availability 🕒\n"
-                          f"- {emoji} **{dispo}**(started on {boot_time})")
-            logging.info(msg=out_msg)
+            out_msg: str = ""
+            if uptime_seconds < self.critical_uptime_seconds:
+                out_msg = f"- 🚨 **Server restarted recently**:\n- {dispo}(started on {boot_time})"
+            elif not display_only_if_critical:
+                if uptime_seconds < self.warning_uptime_seconds:
+                    out_msg = f"- ⚠️ **Server restarted recently**: {dispo}(started on {boot_time})"
+                else:
+                    # Funny emoji depending on uptime if everything is fine
+                    emoji: str = ""
+                    if years >= 2:
+                        emoji = "🎂"
+                    if years >= 1:
+                        emoji = "🎉"
+                    elif months >= 6:
+                        emoji = "🥳"
+                    elif months >= 1:
+                        emoji = "😀"
+                    elif days >= 1:
+                        emoji = "🎊"
+                    elif hours >= 1:
+                        emoji = "👶"
+                    elif minutes >= 20:
+                        emoji = "🤔"
+                    else:
+                        emoji = "☢️"
+
+                    out_msg = f"- {emoji} **{dispo}**(started on {boot_time})"
 
+            if out_msg != "":
+                out_msg = f"# 🕒 System availability 🕒\n{out_msg}"
+                logging.info(msg=out_msg)
         except Exception as e:
             out_msg = f"- ⚠️ **Error getting system uptime**:\n```sh\n{e}\n```"
             logging.exception(msg=out_msg)
@@ -1030,7 +1048,7 @@ class LinuxMonitor:
             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**\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:
@@ -1041,12 +1059,12 @@ class LinuxMonitor:
                 else:
                     icon = "✅ "
 
-                out_msg = f"- {icon}[{display_name}](https://{hostname}): {remaining_days} remaining days (expires on {expiry_date.strftime('%d/%m/%Y')} which is in less than {critical_remaining_days} days)"
+                out_msg = f"- {icon}[{display_name}](https://{hostname}): {remaining_days} remaining days (expires on {expiry_date.strftime('%d/%m/%Y')}))"
                 logging.info(msg=out_msg)
 
             # Display the error of retrieving the certificate if there is one
             if cert_infos["error"]:
-                out_msg += f":\n - Error: `{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)
@@ -1615,6 +1633,7 @@ class LinuxMonitor:
         datetime_last_user_logins_error_displayed: Optional[datetime] = None
         datetime_last_port_error_displayed: Optional[datetime] = None
         datetime_last_services_error_displayed: Optional[datetime] = None
+        need_to_check_uptime: bool = True # No need to check uptime every time (since once ok, it can't be wrong)
 
         if not self.start_scheduled_task_show_info_immediately:
             logging.info(msg=f"Waiting for {self.duration_in_sec_wait_between_each_schedule_task_execution} seconds before starting the execution of {'private' if is_private else 'public'} scheduled tasks...")
@@ -1860,6 +1879,19 @@ class LinuxMonitor:
                         datetime_last_cpu_temperature_error_displayed = None
                     else:
                         logging.info(msg="- ✅ CPU temperature is OK.")
+
+                # Uptime
+                if is_private:
+                    if need_to_check_uptime:
+                        msg = self.check_uptime(display_only_if_critical=True)
+                        need_to_check_uptime = False
+                        if msg != "":
+                            logging.warning(msg=msg)
+                            if out_msg != "":
+                                out_msg += "\n"
+                            out_msg += msg
+                        else:
+                            logging.info(msg="- ✅ Uptime is OK.")
             except Exception as e:
                 out_msg = f"**Internal error during periodic server check task**:\n```sh\n{e}\n```"
                 logging.exception(msg=out_msg)

{linuxmonitor-1.0.5 → linuxmonitor-1.1.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.0.5",
+    version="1.1.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",