LinuxMonitor 1.0.2__tar.gz → 1.0.4__tar.gz

{linuxmonitor-1.0.2 → linuxmonitor-1.0.4/LinuxMonitor.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: LinuxMonitor
-Version: 1.0.2
+Version: 1.0.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
@@ -77,14 +77,14 @@ echo "USERNAME_HERE ALL=(ALL) NOPASSWD: /bin/systemctl" >> /etc/sudoers.d/USERNA
 echo "USERNAME_HERE ALL=(ALL) NOPASSWD: /etc/init.d/apache2" >> /etc/sudoers.d/USERNAME_HERE
 echo "USERNAME_HERE ALL=(ALL) NOPASSWD: /etc/init.d/mariadb" >> /etc/sudoers.d/USERNAME_HERE
 ```
-  - Check monitor possibilities (you can find it out by calling `python linuxmonitor/linuxmonitor.py --help` from the root of this repository)
+  - Check monitor possibilities (you can find it out by calling `python -m linuxmonitor.py --help` from the root of this repository)
   - Load your shell or python script
 
 ## How to use in shell
 
 ```shell
 # Get help
-python3 linuxmonitor/linuxmonitor.py --help
+python3 -m linuxmonitor.py --help
 # Use "--debug" to show more information during command
 # Use "--nodebug" to not show any warning information during command
 
@@ -92,55 +92,55 @@ python3 linuxmonitor/linuxmonitor.py --help
 
 # Start periodic task to show potential issues periodically (will run indefinitely)
 # Best is to call this as a service and put the result in a log file or do something of the stdout
-python3 linuxmonitor/linuxmonitor.py --start_scheduled_task_check_for_issues --config_file config-example.json --nodebug
+python3 -m linuxmonitor.py --start_scheduled_task_check_for_issues --config_file config-example.json --nodebug
 
 # Start periodic task to show system information periodically (will run indefinitely)
 # Best is to call this as a service and put the result in a log file or do something of the stdout
-python3 linuxmonitor/linuxmonitor.py --start_scheduled_task_show_info --config_file config-example.json --nodebug
+python3 -m linuxmonitor.py --start_scheduled_task_show_info --config_file config-example.json --nodebug
 
 
 
 # View disk space, CPU, RAM, ...
-python3 linuxmonitor/linuxmonitor.py --usage --config_file config-example.json
+python3 -m linuxmonitor.py --usage --config_file config-example.json
 
 # View basic system information
-python3 linuxmonitor/linuxmonitor.py --os_infos --config_file config-example.json
+python3 -m linuxmonitor.py --os_infos --config_file config-example.json
 
 # View connected users
-python3 linuxmonitor/linuxmonitor.py --users --config_file config-example.json
+python3 -m linuxmonitor.py --users --config_file config-example.json
 
 # View last user connections
-python3 linuxmonitor/linuxmonitor.py --user_logins --config_file config-example.json
+python3 -m linuxmonitor.py --user_logins --config_file config-example.json
 
 # Check websites (ping)
-python3 linuxmonitor/linuxmonitor.py --ping --config_file config-example.json
+python3 -m linuxmonitor.py --ping --config_file config-example.json
 
 # Check SSL certificates
-python3 linuxmonitor/linuxmonitor.py --certificates --config_file config-example.json
+python3 -m linuxmonitor.py --certificates --config_file config-example.json
 
 # Check if services are running and restart if down
-python3 linuxmonitor/linuxmonitor.py --services_status --config_file config-example.json
+python3 -m linuxmonitor.py --services_status --config_file config-example.json
 
 # List all available services
-python3 linuxmonitor/linuxmonitor.py --list_services --config_file config-example.json
+python3 -m linuxmonitor.py --list_services --config_file config-example.json
 
 # Restart all services
-python3 linuxmonitor/linuxmonitor.py --restart_all --config_file config-example.json
+python3 -m linuxmonitor.py --restart_all --config_file config-example.json
 
 # Restart a service
-python3 linuxmonitor/linuxmonitor.py --restart_service SERVICE_NAME_HERE --config_file config-example.json
+python3 -m linuxmonitor.py --restart_service SERVICE_NAME_HERE --config_file config-example.json
 
 # Check ports
-python3 linuxmonitor/linuxmonitor.py --ports --config_file config-example.json
+python3 -m linuxmonitor.py --ports --config_file config-example.json
 
 # List active processes
-python3 linuxmonitor/linuxmonitor.py --list_processes --config_file config-example.json
+python3 -m linuxmonitor.py --list_processes --config_file config-example.json
 
 # Stop a process by PID
-python3 linuxmonitor/linuxmonitor.py --kill_process PID_HERE --config_file config-example.json
+python3 -m linuxmonitor.py --kill_process PID_HERE --config_file config-example.json
 
 # Restart the entire server
-python3 linuxmonitor/linuxmonitor.py --reboot_server --config_file config-example.json
+python3 -m linuxmonitor.py --reboot_server --config_file config-example.json
 ```
 
 ## How to use in python script

{linuxmonitor-1.0.2 → linuxmonitor-1.0.4}/LinuxMonitor.egg-info/SOURCES.txt

@@ -8,4 +8,5 @@ LinuxMonitor.egg-info/dependency_links.txt
 LinuxMonitor.egg-info/requires.txt
 LinuxMonitor.egg-info/top_level.txt
 linuxmonitor/__init__.py
+linuxmonitor/__main__.py
 linuxmonitor/linuxmonitor.py

{linuxmonitor-1.0.2/LinuxMonitor.egg-info → linuxmonitor-1.0.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: LinuxMonitor
-Version: 1.0.2
+Version: 1.0.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
@@ -77,14 +77,14 @@ echo "USERNAME_HERE ALL=(ALL) NOPASSWD: /bin/systemctl" >> /etc/sudoers.d/USERNA
 echo "USERNAME_HERE ALL=(ALL) NOPASSWD: /etc/init.d/apache2" >> /etc/sudoers.d/USERNAME_HERE
 echo "USERNAME_HERE ALL=(ALL) NOPASSWD: /etc/init.d/mariadb" >> /etc/sudoers.d/USERNAME_HERE
 ```
-  - Check monitor possibilities (you can find it out by calling `python linuxmonitor/linuxmonitor.py --help` from the root of this repository)
+  - Check monitor possibilities (you can find it out by calling `python -m linuxmonitor.py --help` from the root of this repository)
   - Load your shell or python script
 
 ## How to use in shell
 
 ```shell
 # Get help
-python3 linuxmonitor/linuxmonitor.py --help
+python3 -m linuxmonitor.py --help
 # Use "--debug" to show more information during command
 # Use "--nodebug" to not show any warning information during command
 
@@ -92,55 +92,55 @@ python3 linuxmonitor/linuxmonitor.py --help
 
 # Start periodic task to show potential issues periodically (will run indefinitely)
 # Best is to call this as a service and put the result in a log file or do something of the stdout
-python3 linuxmonitor/linuxmonitor.py --start_scheduled_task_check_for_issues --config_file config-example.json --nodebug
+python3 -m linuxmonitor.py --start_scheduled_task_check_for_issues --config_file config-example.json --nodebug
 
 # Start periodic task to show system information periodically (will run indefinitely)
 # Best is to call this as a service and put the result in a log file or do something of the stdout
-python3 linuxmonitor/linuxmonitor.py --start_scheduled_task_show_info --config_file config-example.json --nodebug
+python3 -m linuxmonitor.py --start_scheduled_task_show_info --config_file config-example.json --nodebug
 
 
 
 # View disk space, CPU, RAM, ...
-python3 linuxmonitor/linuxmonitor.py --usage --config_file config-example.json
+python3 -m linuxmonitor.py --usage --config_file config-example.json
 
 # View basic system information
-python3 linuxmonitor/linuxmonitor.py --os_infos --config_file config-example.json
+python3 -m linuxmonitor.py --os_infos --config_file config-example.json
 
 # View connected users
-python3 linuxmonitor/linuxmonitor.py --users --config_file config-example.json
+python3 -m linuxmonitor.py --users --config_file config-example.json
 
 # View last user connections
-python3 linuxmonitor/linuxmonitor.py --user_logins --config_file config-example.json
+python3 -m linuxmonitor.py --user_logins --config_file config-example.json
 
 # Check websites (ping)
-python3 linuxmonitor/linuxmonitor.py --ping --config_file config-example.json
+python3 -m linuxmonitor.py --ping --config_file config-example.json
 
 # Check SSL certificates
-python3 linuxmonitor/linuxmonitor.py --certificates --config_file config-example.json
+python3 -m linuxmonitor.py --certificates --config_file config-example.json
 
 # Check if services are running and restart if down
-python3 linuxmonitor/linuxmonitor.py --services_status --config_file config-example.json
+python3 -m linuxmonitor.py --services_status --config_file config-example.json
 
 # List all available services
-python3 linuxmonitor/linuxmonitor.py --list_services --config_file config-example.json
+python3 -m linuxmonitor.py --list_services --config_file config-example.json
 
 # Restart all services
-python3 linuxmonitor/linuxmonitor.py --restart_all --config_file config-example.json
+python3 -m linuxmonitor.py --restart_all --config_file config-example.json
 
 # Restart a service
-python3 linuxmonitor/linuxmonitor.py --restart_service SERVICE_NAME_HERE --config_file config-example.json
+python3 -m linuxmonitor.py --restart_service SERVICE_NAME_HERE --config_file config-example.json
 
 # Check ports
-python3 linuxmonitor/linuxmonitor.py --ports --config_file config-example.json
+python3 -m linuxmonitor.py --ports --config_file config-example.json
 
 # List active processes
-python3 linuxmonitor/linuxmonitor.py --list_processes --config_file config-example.json
+python3 -m linuxmonitor.py --list_processes --config_file config-example.json
 
 # Stop a process by PID
-python3 linuxmonitor/linuxmonitor.py --kill_process PID_HERE --config_file config-example.json
+python3 -m linuxmonitor.py --kill_process PID_HERE --config_file config-example.json
 
 # Restart the entire server
-python3 linuxmonitor/linuxmonitor.py --reboot_server --config_file config-example.json
+python3 -m linuxmonitor.py --reboot_server --config_file config-example.json
 ```
 
 ## How to use in python script

{linuxmonitor-1.0.2 → linuxmonitor-1.0.4}/README.md

@@ -49,14 +49,14 @@ echo "USERNAME_HERE ALL=(ALL) NOPASSWD: /bin/systemctl" >> /etc/sudoers.d/USERNA
 echo "USERNAME_HERE ALL=(ALL) NOPASSWD: /etc/init.d/apache2" >> /etc/sudoers.d/USERNAME_HERE
 echo "USERNAME_HERE ALL=(ALL) NOPASSWD: /etc/init.d/mariadb" >> /etc/sudoers.d/USERNAME_HERE
 ```
-  - Check monitor possibilities (you can find it out by calling `python linuxmonitor/linuxmonitor.py --help` from the root of this repository)
+  - Check monitor possibilities (you can find it out by calling `python -m linuxmonitor.py --help` from the root of this repository)
   - Load your shell or python script
 
 ## How to use in shell
 
 ```shell
 # Get help
-python3 linuxmonitor/linuxmonitor.py --help
+python3 -m linuxmonitor.py --help
 # Use "--debug" to show more information during command
 # Use "--nodebug" to not show any warning information during command
 
@@ -64,55 +64,55 @@ python3 linuxmonitor/linuxmonitor.py --help
 
 # Start periodic task to show potential issues periodically (will run indefinitely)
 # Best is to call this as a service and put the result in a log file or do something of the stdout
-python3 linuxmonitor/linuxmonitor.py --start_scheduled_task_check_for_issues --config_file config-example.json --nodebug
+python3 -m linuxmonitor.py --start_scheduled_task_check_for_issues --config_file config-example.json --nodebug
 
 # Start periodic task to show system information periodically (will run indefinitely)
 # Best is to call this as a service and put the result in a log file or do something of the stdout
-python3 linuxmonitor/linuxmonitor.py --start_scheduled_task_show_info --config_file config-example.json --nodebug
+python3 -m linuxmonitor.py --start_scheduled_task_show_info --config_file config-example.json --nodebug
 
 
 
 # View disk space, CPU, RAM, ...
-python3 linuxmonitor/linuxmonitor.py --usage --config_file config-example.json
+python3 -m linuxmonitor.py --usage --config_file config-example.json
 
 # View basic system information
-python3 linuxmonitor/linuxmonitor.py --os_infos --config_file config-example.json
+python3 -m linuxmonitor.py --os_infos --config_file config-example.json
 
 # View connected users
-python3 linuxmonitor/linuxmonitor.py --users --config_file config-example.json
+python3 -m linuxmonitor.py --users --config_file config-example.json
 
 # View last user connections
-python3 linuxmonitor/linuxmonitor.py --user_logins --config_file config-example.json
+python3 -m linuxmonitor.py --user_logins --config_file config-example.json
 
 # Check websites (ping)
-python3 linuxmonitor/linuxmonitor.py --ping --config_file config-example.json
+python3 -m linuxmonitor.py --ping --config_file config-example.json
 
 # Check SSL certificates
-python3 linuxmonitor/linuxmonitor.py --certificates --config_file config-example.json
+python3 -m linuxmonitor.py --certificates --config_file config-example.json
 
 # Check if services are running and restart if down
-python3 linuxmonitor/linuxmonitor.py --services_status --config_file config-example.json
+python3 -m linuxmonitor.py --services_status --config_file config-example.json
 
 # List all available services
-python3 linuxmonitor/linuxmonitor.py --list_services --config_file config-example.json
+python3 -m linuxmonitor.py --list_services --config_file config-example.json
 
 # Restart all services
-python3 linuxmonitor/linuxmonitor.py --restart_all --config_file config-example.json
+python3 -m linuxmonitor.py --restart_all --config_file config-example.json
 
 # Restart a service
-python3 linuxmonitor/linuxmonitor.py --restart_service SERVICE_NAME_HERE --config_file config-example.json
+python3 -m linuxmonitor.py --restart_service SERVICE_NAME_HERE --config_file config-example.json
 
 # Check ports
-python3 linuxmonitor/linuxmonitor.py --ports --config_file config-example.json
+python3 -m linuxmonitor.py --ports --config_file config-example.json
 
 # List active processes
-python3 linuxmonitor/linuxmonitor.py --list_processes --config_file config-example.json
+python3 -m linuxmonitor.py --list_processes --config_file config-example.json
 
 # Stop a process by PID
-python3 linuxmonitor/linuxmonitor.py --kill_process PID_HERE --config_file config-example.json
+python3 -m linuxmonitor.py --kill_process PID_HERE --config_file config-example.json
 
 # Restart the entire server
-python3 linuxmonitor/linuxmonitor.py --reboot_server --config_file config-example.json
+python3 -m linuxmonitor.py --reboot_server --config_file config-example.json
 ```
 
 ## How to use in python script

linuxmonitor-1.0.4/linuxmonitor/__main__.py

@@ -0,0 +1,176 @@
+from .linuxmonitor import LinuxMonitor
+
+import argparse
+import sys
+import logging
+import asyncio
+
+def main() -> None:
+    parser = argparse.ArgumentParser(description='System Management CLI Tool')
+
+    # Define available arguments
+    parser.add_argument('--config_file', type=str, required=True, help='Path to the configuration file (must be a JSON file)')
+    parser.add_argument('--start_scheduled_task_check_for_issues', action='store_true', help='Start periodic task to show potential issues periodically (in background, will not stop until you stop the script)')
+    parser.add_argument('--start_scheduled_task_show_info', action='store_true', help='Start periodic task to show system information periodically (in background, will not stop until you stop the script)')
+    parser.add_argument('--usage', action='store_true', help='📊 View disk space, CPU, RAM, ... 📊')
+    parser.add_argument('--os_infos', action='store_true', help='🖥 View basic system information 🖥')
+    parser.add_argument('--users', action='store_true', help='👥 View connected users 👥')
+    parser.add_argument('--user_logins', action='store_true', help='👥 View last user connections 👥')
+    parser.add_argument('--ping', action='store_true', help='🌐 Ping websites 🌐')
+    parser.add_argument('--certificates', action='store_true', help='🔒 Check SSL certificates 🔒')
+    parser.add_argument('--reboot_server', action='store_true', help='🔄 Restart the entire server 🔄')
+    parser.add_argument('--services_status', action='store_true', help='🩺 Check services are running 🩺')
+    parser.add_argument('--restart_all', action='store_true', help='🚀 Restart all services 🚀')
+    parser.add_argument('--restart_service', type=str, help='🚀 Restart a service 🚀')
+    parser.add_argument('--list_services', action='store_true', help='📋 List all available services 📋')
+    parser.add_argument('--ports', action='store_true', help='🔒 Check ports 🔒')
+    parser.add_argument('--list_processes', action='store_true', help='📋 List active processes 📋')
+    parser.add_argument('--kill_process', type=int, help='🚫 Stop a process by PID 🚫')
+
+    parser.add_argument('--debug', action='store_true', help='Enable debug mode')
+    parser.add_argument('--nodebug', action='store_true', help='Disable all logs')
+
+    # Parse arguments
+    args = parser.parse_args()
+
+    # Enable or disable debug mode
+    if args.debug:
+        logging.getLogger().setLevel(logging.DEBUG)
+    elif args.nodebug:
+        logging.getLogger().setLevel(logging.CRITICAL)
+    else:
+        # Default to warning
+        logging.getLogger().setLevel(logging.WARNING)
+
+    # Ensure the config file is provided
+    if not args.config_file:
+        print("Error: --config_file is required")
+        parser.print_help()
+        sys.exit(1)
+
+    allow_scheduled_tasks_check_for_issues: bool = args.start_scheduled_task_check_for_issues is not None
+    allow_scheduled_task_show_info: bool = args.start_scheduled_task_show_info is not None
+    monitoring = LinuxMonitor(config_file=args.config_file, allow_scheduled_tasks_check_for_issues=allow_scheduled_tasks_check_for_issues, allow_scheduled_task_show_info=allow_scheduled_task_show_info)
+
+    # Handle all commands
+    handled: bool = False
+
+    if args.usage:
+        handled = True
+        print("Viewing disk space, CPU, RAM, ...")
+        out_msg: str = monitoring.check_all_disk_usage(is_private=True, display_only_if_critical=False)
+        msg: str = monitoring.check_all_folder_usage(is_private=True, display_only_if_critical=False)
+        if msg != "":
+            if out_msg != "":
+                out_msg += "\n"
+            out_msg += msg
+
+        out_msg += "\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 += monitoring.check_cpu_temperature(display_only_if_critical=False) + "\n"
+        out_msg += monitoring.get_network_info()
+        print(out_msg)
+
+    if args.os_infos:
+        handled = True
+        print("Viewing basic system information...")
+        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.get_server_datetime()
+        print(out_msg)
+
+    if args.users:
+        handled = True
+        print("Viewing connected users...")
+        out_msg: str = monitoring.get_connected_users()
+        print(out_msg)
+
+    if args.user_logins:
+        handled = True
+        print("Viewing last user connections...")
+        out_msg: str = monitoring.check_all_recent_user_logins(display_only_if_critical=False)
+        print(out_msg)
+
+    if args.ping:
+        handled = True
+        print("Pinging websites...")
+        out_msg: str = monitoring.ping_all_websites(is_private=True, display_only_if_critical=False)
+        print(out_msg)
+
+    if args.certificates:
+        handled = True
+        print("Checking SSL certificates...")
+        out_msg: str = monitoring.check_all_certificates(is_private=True, display_only_if_critical=False)
+        print(out_msg)
+
+    if args.reboot_server:
+        handled = True
+        print("Restarting the entire server...")
+        out_msg: str = monitoring.reboot_server()
+        print(out_msg)
+
+    if args.services_status:
+        handled = True
+        print("Checking if services are running and restart if down...")
+        out_msg: str = monitoring.check_all_services_status_and_restart_if_down(is_private=True)
+        print(out_msg)
+
+    if args.restart_all:
+        handled = True
+        print("Restarting all services...")
+        out_msg: str = monitoring.restart_all_services(is_private=True)
+
+    if args.restart_service is not None:
+        handled = True
+        print(f"Restarting service: {args.restart_service}...")
+        out_msg: str = monitoring.restart_service(is_private=True, service_name=args.restart_service)
+        print(out_msg)
+
+    if args.list_services:
+        handled = True
+        print("Listing all available services...")
+        out_msg: str = monitoring.get_all_services_allowed_to_restart(is_private=True)
+        print(out_msg)
+
+    if args.ports:
+        handled = True
+        print("Checking ports...")
+        out_msg: str = monitoring.check_all_ports(is_private=True, display_only_if_critical=False, restart_if_down=False)
+        print(out_msg)
+
+    if args.list_processes:
+        handled = True
+        print("Listing active processes...")
+        out_msg: str = monitoring.get_ordered_processes(get_non_consuming_processes=False)
+        print(out_msg)
+
+    if args.kill_process is not None:
+        handled = True
+        print(f"Stopping process with PID: {args.kill_process}...")
+        out_msg: str = monitoring.kill_process(pid=args.kill_process)
+        print(out_msg)
+
+    if args.start_scheduled_task_check_for_issues:
+        handled = True
+        print("Starting periodic task (will show something only in case of error (or if debug enabled))...")
+        async def async_print(msg: str) -> None:
+            print(msg)
+        asyncio.run(monitoring.schedule_task(handle_error_message=async_print, is_private=True))
+
+    if args.start_scheduled_task_show_info:
+        handled = True
+        print("Starting periodic task (will show system information periodically)...")
+        async def async_print(msg: str) -> None:
+            print(msg)
+        asyncio.run(monitoring.schedule_task_show_info(show_message=async_print, is_private=True))
+
+    # Show help if no command was provided or the command was not recognized
+    if not handled:
+        parser.print_help()
+
+if __name__ == "__main__":
+    main()

{linuxmonitor-1.0.2 → linuxmonitor-1.0.4}/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.2 (2024/09/13)"
+__version__ = "1.0.4 (2024/09/14)"
 __status__ = "Usable for any Linux project"
 
 import json
@@ -45,8 +45,6 @@ import platform
 import re
 import logging
 import asyncio
-import argparse
-import sys
 
 class LinuxMonitor:
     def __init__(self, config_file: str, allow_scheduled_tasks_check_for_issues: bool, allow_scheduled_task_show_info: bool) -> None:
@@ -701,7 +699,7 @@ class LinuxMonitor:
 
     #region Ping Websites
 
-    def _ping_website(self, website: str, display_name: str, display_only_if_critical: bool=False) -> str:
+    def _ping_website(self, website: str, display_name: str, timeout_in_sec: int, display_only_if_critical: bool=False) -> str:
         """
         Ping a website.
 
@@ -715,7 +713,7 @@ class LinuxMonitor:
         display_name = f"[{display_name}](https://{website})"
 
         start_time: float = time.time()
-        res, out_msg = self.execute_and_verify(command=ping_command, display_name=f"ping {display_name}", timeout_in_sec=5, display_only_if_critical=display_only_if_critical)
+        res, out_msg = self.execute_and_verify(command=ping_command, display_name=f"ping {display_name}", timeout_in_sec=timeout_in_sec, display_only_if_critical=display_only_if_critical)
         end_time: float = time.time()
 
         if res == True and not display_only_if_critical:
@@ -737,7 +735,8 @@ class LinuxMonitor:
         out_msg: str = ""
         for ping_config in self.config['pings']:
             if is_private or is_private == ping_config['is_private']:
-                result: str = self._ping_website(website=ping_config['website'], display_name=ping_config['display_name'], display_only_if_critical=display_only_if_critical)
+                timeout_in_sec: int = ping_config.get('timeout_in_sec', 5)
+                result: str = self._ping_website(website=ping_config['website'], display_name=ping_config['display_name'], timeout_in_sec=timeout_in_sec, display_only_if_critical=display_only_if_critical)
                 if result:
                     if out_msg:
                         out_msg += "\n"
@@ -1993,173 +1992,3 @@ class LinuxMonitor:
             await asyncio.sleep(delay=self.duration_in_sec_wait_between_each_schedule_task_show_info_execution)
 
     #endregion
-
-def main() -> None:
-    parser = argparse.ArgumentParser(description='System Management CLI Tool')
-
-    # Define available arguments
-    parser.add_argument('--config_file', type=str, required=True, help='Path to the configuration file (must be a JSON file)')
-    parser.add_argument('--start_scheduled_task_check_for_issues', action='store_true', help='Start periodic task to show potential issues periodically (in background, will not stop until you stop the script)')
-    parser.add_argument('--start_scheduled_task_show_info', action='store_true', help='Start periodic task to show system information periodically (in background, will not stop until you stop the script)')
-    parser.add_argument('--usage', action='store_true', help='📊 View disk space, CPU, RAM, ... 📊')
-    parser.add_argument('--os_infos', action='store_true', help='🖥 View basic system information 🖥')
-    parser.add_argument('--users', action='store_true', help='👥 View connected users 👥')
-    parser.add_argument('--user_logins', action='store_true', help='👥 View last user connections 👥')
-    parser.add_argument('--ping', action='store_true', help='🌐 Ping websites 🌐')
-    parser.add_argument('--certificates', action='store_true', help='🔒 Check SSL certificates 🔒')
-    parser.add_argument('--reboot_server', action='store_true', help='🔄 Restart the entire server 🔄')
-    parser.add_argument('--services_status', action='store_true', help='🩺 Check services are running 🩺')
-    parser.add_argument('--restart_all', action='store_true', help='🚀 Restart all services 🚀')
-    parser.add_argument('--restart_service', type=str, help='🚀 Restart a service 🚀')
-    parser.add_argument('--list_services', action='store_true', help='📋 List all available services 📋')
-    parser.add_argument('--ports', action='store_true', help='🔒 Check ports 🔒')
-    parser.add_argument('--list_processes', action='store_true', help='📋 List active processes 📋')
-    parser.add_argument('--kill_process', type=int, help='🚫 Stop a process by PID 🚫')
-
-    parser.add_argument('--debug', action='store_true', help='Enable debug mode')
-    parser.add_argument('--nodebug', action='store_true', help='Disable all logs')
-
-    # Parse arguments
-    args = parser.parse_args()
-
-    # Enable or disable debug mode
-    if args.debug:
-        logging.getLogger().setLevel(logging.DEBUG)
-    elif args.nodebug:
-        logging.getLogger().setLevel(logging.CRITICAL)
-    else:
-        # Default to warning
-        logging.getLogger().setLevel(logging.WARNING)
-
-    # Ensure the config file is provided
-    if not args.config_file:
-        print("Error: --config_file is required")
-        parser.print_help()
-        sys.exit(1)
-
-    allow_scheduled_tasks_check_for_issues: bool = args.start_scheduled_task_check_for_issues is not None
-    allow_scheduled_task_show_info: bool = args.start_scheduled_task_show_info is not None
-    monitoring = LinuxMonitor(config_file=args.config_file, allow_scheduled_tasks_check_for_issues=allow_scheduled_tasks_check_for_issues, allow_scheduled_task_show_info=allow_scheduled_task_show_info)
-
-    # Handle all commands
-    handled: bool = False
-
-    if args.usage:
-        handled = True
-        print("Viewing disk space, CPU, RAM, ...")
-        out_msg: str = monitoring.check_all_disk_usage(is_private=True, display_only_if_critical=False)
-        msg: str = monitoring.check_all_folder_usage(is_private=True, display_only_if_critical=False)
-        if msg != "":
-            if out_msg != "":
-                out_msg += "\n"
-            out_msg += msg
-
-        out_msg += "\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 += monitoring.check_cpu_temperature(display_only_if_critical=False) + "\n"
-        out_msg += monitoring.get_network_info()
-        print(out_msg)
-
-    if args.os_infos:
-        handled = True
-        print("Viewing basic system information...")
-        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.get_server_datetime()
-        print(out_msg)
-
-    if args.users:
-        handled = True
-        print("Viewing connected users...")
-        out_msg: str = monitoring.get_connected_users()
-        print(out_msg)
-
-    if args.user_logins:
-        handled = True
-        print("Viewing last user connections...")
-        out_msg: str = monitoring.check_all_recent_user_logins(display_only_if_critical=False)
-        print(out_msg)
-
-    if args.ping:
-        handled = True
-        print("Pinging websites...")
-        out_msg: str = monitoring.ping_all_websites(is_private=True, display_only_if_critical=False)
-        print(out_msg)
-
-    if args.certificates:
-        handled = True
-        print("Checking SSL certificates...")
-        out_msg: str = monitoring.check_all_certificates(is_private=True, display_only_if_critical=False)
-        print(out_msg)
-
-    if args.reboot_server:
-        handled = True
-        print("Restarting the entire server...")
-        out_msg: str = monitoring.reboot_server()
-        print(out_msg)
-
-    if args.services_status:
-        handled = True
-        print("Checking if services are running and restart if down...")
-        out_msg: str = monitoring.check_all_services_status_and_restart_if_down(is_private=True)
-        print(out_msg)
-
-    if args.restart_all:
-        handled = True
-        print("Restarting all services...")
-        out_msg: str = monitoring.restart_all_services(is_private=True)
-
-    if args.restart_service is not None:
-        handled = True
-        print(f"Restarting service: {args.restart_service}...")
-        out_msg: str = monitoring.restart_service(is_private=True, service_name=args.restart_service)
-        print(out_msg)
-
-    if args.list_services:
-        handled = True
-        print("Listing all available services...")
-        out_msg: str = monitoring.get_all_services_allowed_to_restart(is_private=True)
-        print(out_msg)
-
-    if args.ports:
-        handled = True
-        print("Checking ports...")
-        out_msg: str = monitoring.check_all_ports(is_private=True, display_only_if_critical=False, restart_if_down=False)
-        print(out_msg)
-
-    if args.list_processes:
-        handled = True
-        print("Listing active processes...")
-        out_msg: str = monitoring.get_ordered_processes(get_non_consuming_processes=False)
-        print(out_msg)
-
-    if args.kill_process is not None:
-        handled = True
-        print(f"Stopping process with PID: {args.kill_process}...")
-        out_msg: str = monitoring.kill_process(pid=args.kill_process)
-        print(out_msg)
-
-    if args.start_scheduled_task_check_for_issues:
-        handled = True
-        print("Starting periodic task (will show something only in case of error (or if debug enabled))...")
-        async def async_print(msg: str) -> None:
-            print(msg)
-        asyncio.run(monitoring.schedule_task(handle_error_message=async_print, is_private=True))
-
-    if args.start_scheduled_task_show_info:
-        handled = True
-        print("Starting periodic task (will show system information periodically)...")
-        async def async_print(msg: str) -> None:
-            print(msg)
-        asyncio.run(monitoring.schedule_task_show_info(show_message=async_print, is_private=True))
-
-    # Show help if no command was provided or the command was not recognized
-    if not handled:
-        parser.print_help()
-
-if __name__ == "__main__":
-    main()

{linuxmonitor-1.0.2 → linuxmonitor-1.0.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.0.2",
+    version="1.0.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",