DiscordBotLinuxMonitor 1.2.2__tar.gz → 1.3.1__tar.gz

{discordbotlinuxmonitor-1.2.2 → discordbotlinuxmonitor-1.3.1}/DiscordBotLinuxMonitor.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: DiscordBotLinuxMonitor
-Version: 1.2.2
+Version: 1.3.1
 Summary: From discord channels: 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/Discord-Bot-Linux-Monitor-Python-Library
 Author: Quentin Comte-Gaz
@@ -22,7 +22,7 @@ Classifier: Environment :: Console
 Requires-Python: >=3.3
 Description-Content-Type: text/markdown
 License-File: LICENSE.md
-Requires-Dist: linuxmonitor~=1.2.0
+Requires-Dist: linuxmonitor~=1.3.0
 Requires-Dist: discord.py
 Requires-Dist: typing
 Requires-Dist: asyncio
@@ -75,12 +75,19 @@ Displayed infos are not the same if you do the command in private or public chan
  - `/restart_service {service_name}`: 🚀 Restart a service 🚀
  <img src="https://raw.githubusercontent.com/QuentinCG/Discord-Bot-Linux-Monitor-Python-Library/master/example/restart_service.jpg" height="150">
 
+ - `/stop_service {service_name}`: 🚫 Stop a service 🚫
+
  - `/list_services`: 📋 List all available services 📋
  <img src="https://raw.githubusercontent.com/QuentinCG/Discord-Bot-Linux-Monitor-Python-Library/master/example/list_services.jpg" height="150">
 
  - `/ports`: 🔒 Check ports 🔒
  <img src="https://raw.githubusercontent.com/QuentinCG/Discord-Bot-Linux-Monitor-Python-Library/master/example/ports.jpg" height="200">
 
+ - `/list_commands`: 📋 List all available commands 📋
+
+ - `/execute_command`: 🚀 Execute a command 🚀
+
+ - `/execute_all_commands`: 🚀 Execute all commands 🚀
 
 ### Private discord channel commands:
  - `/force_sync`: 🔄 Force discord command synchronization 🔄

{discordbotlinuxmonitor-1.2.2 → discordbotlinuxmonitor-1.3.1}/DiscordBotLinuxMonitor.egg-info/requires.txt

@@ -1,4 +1,4 @@
-linuxmonitor~=1.2.0
+linuxmonitor~=1.3.0
 discord.py
 typing
 asyncio

{discordbotlinuxmonitor-1.2.2 → discordbotlinuxmonitor-1.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: DiscordBotLinuxMonitor
-Version: 1.2.2
+Version: 1.3.1
 Summary: From discord channels: 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/Discord-Bot-Linux-Monitor-Python-Library
 Author: Quentin Comte-Gaz
@@ -22,7 +22,7 @@ Classifier: Environment :: Console
 Requires-Python: >=3.3
 Description-Content-Type: text/markdown
 License-File: LICENSE.md
-Requires-Dist: linuxmonitor~=1.2.0
+Requires-Dist: linuxmonitor~=1.3.0
 Requires-Dist: discord.py
 Requires-Dist: typing
 Requires-Dist: asyncio
@@ -75,12 +75,19 @@ Displayed infos are not the same if you do the command in private or public chan
  - `/restart_service {service_name}`: 🚀 Restart a service 🚀
  <img src="https://raw.githubusercontent.com/QuentinCG/Discord-Bot-Linux-Monitor-Python-Library/master/example/restart_service.jpg" height="150">
 
+ - `/stop_service {service_name}`: 🚫 Stop a service 🚫
+
  - `/list_services`: 📋 List all available services 📋
  <img src="https://raw.githubusercontent.com/QuentinCG/Discord-Bot-Linux-Monitor-Python-Library/master/example/list_services.jpg" height="150">
 
  - `/ports`: 🔒 Check ports 🔒
  <img src="https://raw.githubusercontent.com/QuentinCG/Discord-Bot-Linux-Monitor-Python-Library/master/example/ports.jpg" height="200">
 
+ - `/list_commands`: 📋 List all available commands 📋
+
+ - `/execute_command`: 🚀 Execute a command 🚀
+
+ - `/execute_all_commands`: 🚀 Execute all commands 🚀
 
 ### Private discord channel commands:
  - `/force_sync`: 🔄 Force discord command synchronization 🔄

{discordbotlinuxmonitor-1.2.2 → discordbotlinuxmonitor-1.3.1}/README.md

@@ -46,12 +46,19 @@ Displayed infos are not the same if you do the command in private or public chan
  - `/restart_service {service_name}`: 🚀 Restart a service 🚀
  <img src="https://raw.githubusercontent.com/QuentinCG/Discord-Bot-Linux-Monitor-Python-Library/master/example/restart_service.jpg" height="150">
 
+ - `/stop_service {service_name}`: 🚫 Stop a service 🚫
+
  - `/list_services`: 📋 List all available services 📋
  <img src="https://raw.githubusercontent.com/QuentinCG/Discord-Bot-Linux-Monitor-Python-Library/master/example/list_services.jpg" height="150">
 
  - `/ports`: 🔒 Check ports 🔒
  <img src="https://raw.githubusercontent.com/QuentinCG/Discord-Bot-Linux-Monitor-Python-Library/master/example/ports.jpg" height="200">
 
+ - `/list_commands`: 📋 List all available commands 📋
+
+ - `/execute_command`: 🚀 Execute a command 🚀
+
+ - `/execute_all_commands`: 🚀 Execute all commands 🚀
 
 ### Private discord channel commands:
  - `/force_sync`: 🔄 Force discord command synchronization 🔄

{discordbotlinuxmonitor-1.2.2 → discordbotlinuxmonitor-1.3.1}/discordbotlinuxmonitor/__main__.py

@@ -98,6 +98,10 @@ def main() -> None:
     async def restart_service(interaction: discord.Interaction, service_name: str) -> None: # type: ignore
         await discord_bot_linux_monitor.restart_service(interaction, service_name)
 
+    @discord_bot.tree.command(name="stop_service", description="🚫 Stop a service 🚫")
+    async def stop_service(interaction: discord.Interaction, service_name: str) -> None: # type: ignore
+        await discord_bot_linux_monitor.stop_service(interaction, service_name)
+
     @discord_bot.tree.command(name="list_services", description="📋 List all available services 📋")
     async def list_services(interaction: discord.Interaction) -> None: # type: ignore
         await discord_bot_linux_monitor.list_services(interaction)
@@ -114,6 +118,18 @@ def main() -> None:
     async def kill_process(interaction: discord.Interaction, pid: int) -> None: # type: ignore
         await discord_bot_linux_monitor.kill_process(interaction, pid)
 
+    @discord_bot.tree.command(name="list_commands", description="📋 List all available commands 📋")
+    async def list_commands(interaction: discord.Interaction) -> None: # type: ignore
+        await discord_bot_linux_monitor.list_commands(interaction)
+
+    @discord_bot.tree.command(name="execute_command", description="🚀 Execute a command 🚀")
+    async def execute_command(interaction: discord.Interaction, command_name: str) -> None: # type: ignore
+        await discord_bot_linux_monitor.execute_command(interaction, command_name=command_name)
+
+    @discord_bot.tree.command(name="execute_all_commands", description="🚀 Execute all commands 🚀")
+    async def execute_all_commands(interaction: discord.Interaction) -> None: # type: ignore
+        await discord_bot_linux_monitor.execute_all_commands(interaction)
+
     #endregion
 
     # Start the discord bot

{discordbotlinuxmonitor-1.2.2 → discordbotlinuxmonitor-1.3.1}/discordbotlinuxmonitor/discordbotlinuxmonitor.py

@@ -20,6 +20,8 @@ Non exhaustive list of features (available by using it in shell or in python scr
     - Get hostname, OS details, kernel version, server datetime, uptime
     - Get connected users
 
+    - Restart/Stop a service
+
     - Get processes list (PID and name)
     - Kill a process by PID
 
@@ -31,7 +33,7 @@ __email__ = "quentin@comte-gaz.com"
 __license__ = "MIT License"
 __copyright__ = "Copyright Quentin Comte-Gaz (2024)"
 __python_version__ = "3.+"
-__version__ = "1.2.2 (2024/09/19)"
+__version__ = "1.3.1 (2024/09/19)"
 __status__ = "Usable for any Linux project"
 
 # pyright: reportMissingTypeStubs=false
@@ -558,7 +560,7 @@ class DiscordBotLinuxMonitor:
 
         try:
             is_private: bool = self._is_private_channel(channel=interaction.channel) # type: ignore
-            out_msg: str = await self.monitoring.check_all_websites(is_private=is_private, display_only_if_critical=False, restart_if_down=True)
+            out_msg: str = await self.monitoring.check_all_websites(is_private=is_private, display_only_if_critical=False)
 
             # Respond to the user
             await self._interaction_followup_send_no_limit(interaction=interaction, msg=out_msg)
@@ -661,7 +663,7 @@ class DiscordBotLinuxMonitor:
         try:
             # Redémarrer le service et récupérer le message de sortie
             is_private: bool = self._is_private_channel(channel=interaction.channel) # type: ignore
-            out_msg: str = await self.monitoring.restart_service(is_private=is_private, service_name=service_name)
+            out_msg: str = await self.monitoring.restart_service(is_private=is_private, service_name=service_name, force_restart=True)
 
             # Répondre à l'utilisateur
             await self._interaction_followup_send_no_limit(interaction=interaction, msg=out_msg)
@@ -671,6 +673,27 @@ class DiscordBotLinuxMonitor:
             logging.exception(msg=out_msg)
             await self._interaction_followup_send_no_limit(interaction=interaction, msg=out_msg)
 
+    async def stop_service(self, interaction: discord.Interaction, service_name: str) -> None:
+        if not self._check_if_valid_guild(guild=interaction.guild):
+            return
+        if not (await self._is_bot_channel_interaction(interaction=interaction, send_message_if_not_bot=True)):
+            return
+
+        # Indiquer que la commande est en cours de traitement
+        await interaction.response.defer()
+
+        try:
+            # Arrêter le service et récupérer le message de sortie
+            is_private: bool = self._is_private_channel(channel=interaction.channel) # type: ignore
+            out_msg: str = await self.monitoring.stop_service(is_private=is_private, service_name=service_name)
+
+            # Répondre à l'utilisateur
+            await self._interaction_followup_send_no_limit(interaction=interaction, msg=out_msg)
+        except Exception as e:
+            out_msg = f"**Internal error stopping service {service_name}**:\n```sh\n{e}\n```"
+            logging.exception(msg=out_msg)
+            await self._interaction_followup_send_no_limit(interaction=interaction, msg=out_msg)
+
     async def list_services(self, interaction: discord.Interaction) -> None:
         if not self._check_if_valid_guild(guild=interaction.guild):
             return
@@ -683,7 +706,7 @@ class DiscordBotLinuxMonitor:
         try:
             # Récupérer la liste des services
             is_private: bool = self._is_private_channel(channel=interaction.channel) # type: ignore
-            out_msg: str = self.monitoring.get_all_services_allowed_to_restart(is_private=is_private)
+            out_msg: str = self.monitoring.get_all_services(is_private=is_private)
 
             # Répondre à l'utilisateur
             await self._interaction_followup_send_no_limit(interaction=interaction, msg=out_msg)
@@ -704,7 +727,7 @@ class DiscordBotLinuxMonitor:
         try:
             # Récupérer le statut des ports
             is_private: bool = self._is_private_channel(channel=interaction.channel) # type: ignore
-            out_msg: str = await self.monitoring.check_all_ports(is_private=is_private, display_only_if_critical=False, restart_if_down=True)
+            out_msg: str = await self.monitoring.check_all_ports(is_private=is_private, display_only_if_critical=False)
 
             # Répondre à l'utilisateur
             await self._interaction_followup_send_no_limit(interaction=interaction, msg=out_msg)
@@ -759,4 +782,68 @@ class DiscordBotLinuxMonitor:
             logging.exception(msg=out_msg)
             await self._interaction_followup_send_no_limit(interaction=interaction, msg=out_msg)
 
+    async def list_commands(self, interaction: discord.Interaction) -> None:
+        if not self._check_if_valid_guild(guild=interaction.guild):
+            return
+        if not (await self._is_bot_channel_interaction(interaction=interaction, send_message_if_not_bot=True)):
+            return
+
+        # Indiquer que la commande est en cours de traitement
+        await interaction.response.defer()
+
+        try:
+            is_private: bool = self._is_private_channel(channel=interaction.channel) # type: ignore
+            # Récupérer la liste des commandes disponibles
+            out_msg: str = await self.monitoring.list_commands(is_private=is_private)
+
+            # Répondre à l'utilisateur
+            await self._interaction_followup_send_no_limit(interaction=interaction, msg=out_msg)
+        except Exception as e:
+            out_msg = f"**Internal error retrieving available commands**:\n```sh\n{e}\n```"
+            logging.exception(msg=out_msg)
+            await self._interaction_followup_send_no_limit(interaction=interaction, msg=out_msg)
+
+
+    async def execute_command(self, interaction: discord.Interaction, command_name: str) -> None:
+        if not self._check_if_valid_guild(guild=interaction.guild):
+            return
+        if not (await self._is_bot_channel_interaction(interaction=interaction, send_message_if_not_bot=True)):
+            return
+
+        # Indiquer que la commande est en cours de traitement
+        await interaction.response.defer()
+
+        try:
+            is_private: bool = self._is_private_channel(channel=interaction.channel) # type: ignore
+            # Exécuter la commande demandée
+            out_msg: str = await self.monitoring.execute_command(is_private=is_private, command_name=command_name)
+
+            # Répondre à l'utilisateur
+            await self._interaction_followup_send_no_limit(interaction=interaction, msg=out_msg)
+        except Exception as e:
+            out_msg = f"**Internal error executing command '{command_name}'**:\n```sh\n{e}\n```"
+            logging.exception(msg=out_msg)
+            await self._interaction_followup_send_no_limit(interaction=interaction, msg=out_msg)
+
+    async def execute_all_commands(self, interaction: discord.Interaction) -> None:
+        if not self._check_if_valid_guild(guild=interaction.guild):
+            return
+        if not (await self._is_bot_channel_interaction(interaction=interaction, send_message_if_not_bot=True)):
+            return
+
+        # Indiquer que la commande est en cours de traitement
+        await interaction.response.defer()
+
+        try:
+            is_private: bool = self._is_private_channel(channel=interaction.channel) # type: ignore
+            # Exécuter toutes les commandes
+            out_msg: str = await self.monitoring.execute_all_commands(is_private=is_private)
+
+            # Répondre à l'utilisateur
+            await self._interaction_followup_send_no_limit(interaction=interaction, msg=out_msg)
+        except Exception as e:
+            out_msg = f"**Internal error executing all commands**:\n```sh\n{e}\n```"
+            logging.exception(msg=out_msg)
+            await self._interaction_followup_send_no_limit(interaction=interaction, msg=out_msg)
+
     #endregion

{discordbotlinuxmonitor-1.2.2 → discordbotlinuxmonitor-1.3.1}/setup.py

@@ -6,7 +6,7 @@ with io.open(file='README.md', mode='r', encoding='utf-8') as readme_file:
 
 setup(
     name="DiscordBotLinuxMonitor",
-    version="1.2.2",
+    version="1.3.1",
     description="From discord channels: 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",
@@ -36,7 +36,7 @@ setup(
     keywords='discord bot warning info linux monitor monitoring server service port ping ssl certificate disk folder cpu ram swap usage ip connection',
     platforms='Linux',
     install_requires=[
-        "linuxmonitor~=1.2.0",  # follows the {MAJOR}.{MINOR}.x version range (because LinuxMonitor and DiscordBotLinuxMonitor are tightly coupled and should have same major and minor version)
+        "linuxmonitor~=1.3.0",  # follows the {MAJOR}.{MINOR}.x version range (because LinuxMonitor and DiscordBotLinuxMonitor are tightly coupled and should have same major and minor version)
         "discord.py",
         "typing",
         "asyncio",