DiscordBotLinuxMonitor 1.0.3__tar.gz → 1.2.1__tar.gz

{discordbotlinuxmonitor-1.0.3 → discordbotlinuxmonitor-1.2.1}/DiscordBotLinuxMonitor.egg-info/PKG-INFO

@@ -1,8 +1,8 @@
 Metadata-Version: 2.1
 Name: DiscordBotLinuxMonitor
-Version: 1.0.3
+Version: 1.2.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/Linux-Monitor-Python-Library
+Home-page: https://github.com/QuentinCG/Discord-Bot-Linux-Monitor-Python-Library
 Author: Quentin Comte-Gaz
 Author-email: quentin@comte-gaz.com
 License: MIT
@@ -22,7 +22,7 @@ Classifier: Environment :: Console
 Requires-Python: >=3.3
 Description-Content-Type: text/markdown
 License-File: LICENSE.md
-Requires-Dist: linuxmonitor
+Requires-Dist: linuxmonitor~=1.2.0
 Requires-Dist: discord.py
 Requires-Dist: typing
 Requires-Dist: asyncio
@@ -60,6 +60,9 @@ Displayed infos are not the same if you do the command in private or public chan
  - `/ping`: 🌐 Ping websites 🌐
  <img src="https://raw.githubusercontent.com/QuentinCG/Discord-Bot-Linux-Monitor-Python-Library/master/example/ping.jpg" height="150">
 
+ - `/websites`: 🌐 Check websites access (GET requests) 🌐
+ <img src="https://raw.githubusercontent.com/QuentinCG/Discord-Bot-Linux-Monitor-Python-Library/master/example/websites.jpg" height="150">
+
  - `/certificates`: 🔒 Check SSL certificates 🔒
  <img src="https://raw.githubusercontent.com/QuentinCG/Discord-Bot-Linux-Monitor-Python-Library/master/example/certificates.jpg" height="400">
 

{discordbotlinuxmonitor-1.0.3 → discordbotlinuxmonitor-1.2.1}/DiscordBotLinuxMonitor.egg-info/requires.txt

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

{discordbotlinuxmonitor-1.0.3 → discordbotlinuxmonitor-1.2.1}/PKG-INFO

@@ -1,8 +1,8 @@
 Metadata-Version: 2.1
 Name: DiscordBotLinuxMonitor
-Version: 1.0.3
+Version: 1.2.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/Linux-Monitor-Python-Library
+Home-page: https://github.com/QuentinCG/Discord-Bot-Linux-Monitor-Python-Library
 Author: Quentin Comte-Gaz
 Author-email: quentin@comte-gaz.com
 License: MIT
@@ -22,7 +22,7 @@ Classifier: Environment :: Console
 Requires-Python: >=3.3
 Description-Content-Type: text/markdown
 License-File: LICENSE.md
-Requires-Dist: linuxmonitor
+Requires-Dist: linuxmonitor~=1.2.0
 Requires-Dist: discord.py
 Requires-Dist: typing
 Requires-Dist: asyncio
@@ -60,6 +60,9 @@ Displayed infos are not the same if you do the command in private or public chan
  - `/ping`: 🌐 Ping websites 🌐
  <img src="https://raw.githubusercontent.com/QuentinCG/Discord-Bot-Linux-Monitor-Python-Library/master/example/ping.jpg" height="150">
 
+ - `/websites`: 🌐 Check websites access (GET requests) 🌐
+ <img src="https://raw.githubusercontent.com/QuentinCG/Discord-Bot-Linux-Monitor-Python-Library/master/example/websites.jpg" height="150">
+
  - `/certificates`: 🔒 Check SSL certificates 🔒
  <img src="https://raw.githubusercontent.com/QuentinCG/Discord-Bot-Linux-Monitor-Python-Library/master/example/certificates.jpg" height="400">
 

{discordbotlinuxmonitor-1.0.3 → discordbotlinuxmonitor-1.2.1}/README.md

@@ -31,6 +31,9 @@ Displayed infos are not the same if you do the command in private or public chan
  - `/ping`: 🌐 Ping websites 🌐
  <img src="https://raw.githubusercontent.com/QuentinCG/Discord-Bot-Linux-Monitor-Python-Library/master/example/ping.jpg" height="150">
 
+ - `/websites`: 🌐 Check websites access (GET requests) 🌐
+ <img src="https://raw.githubusercontent.com/QuentinCG/Discord-Bot-Linux-Monitor-Python-Library/master/example/websites.jpg" height="150">
+
  - `/certificates`: 🔒 Check SSL certificates 🔒
  <img src="https://raw.githubusercontent.com/QuentinCG/Discord-Bot-Linux-Monitor-Python-Library/master/example/certificates.jpg" height="400">
 

{discordbotlinuxmonitor-1.0.3 → discordbotlinuxmonitor-1.2.1}/discordbotlinuxmonitor/__main__.py

@@ -74,6 +74,10 @@ def main() -> None:
     async def ping(interaction: discord.Interaction) -> None: # type: ignore
         await discord_bot_linux_monitor.ping(interaction)
 
+    @discord_bot.tree.command(name="websites", description="🌐 Check websites access (GET requests) 🌐")
+    async def websites(interaction: discord.Interaction) -> None: # type: ignore
+        await discord_bot_linux_monitor.websites(interaction)
+
     @discord_bot.tree.command(name="certificates", description="🔒 Check SSL certificates 🔒")
     async def certificates(interaction: discord.Interaction) -> None: # type: ignore
         await discord_bot_linux_monitor.certificates(interaction)

{discordbotlinuxmonitor-1.0.3 → discordbotlinuxmonitor-1.2.1}/discordbotlinuxmonitor/discordbotlinuxmonitor.py

@@ -11,6 +11,7 @@ Non exhaustive list of features (available by using it in shell or in python scr
     - Check disk usage
     - Check folder usage
     - Check websites basic availability (ping)
+    - Check websites access with optional authentication (GET request)
     - Check services status and restart them if needed
     - Check certificates expiration and validity
     - Check last user connections IPs
@@ -30,7 +31,7 @@ __email__ = "quentin@comte-gaz.com"
 __license__ = "MIT License"
 __copyright__ = "Copyright Quentin Comte-Gaz (2024)"
 __python_version__ = "3.+"
-__version__ = "1.0.3 (2024/09/14)"
+__version__ = "1.2.1 (2024/09/16)"
 __status__ = "Usable for any Linux project"
 
 # pyright: reportMissingTypeStubs=false
@@ -537,7 +538,7 @@ class DiscordBotLinuxMonitor:
 
         try:
             is_private: bool = self._is_private_channel(channel=interaction.channel) # type: ignore
-            out_msg: str = self.monitoring.ping_all_websites(is_private=is_private, display_only_if_critical=False)
+            out_msg: str = await self.monitoring.ping_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)
@@ -546,6 +547,26 @@ class DiscordBotLinuxMonitor:
             logging.exception(msg=out_msg)
             await self._interaction_followup_send_no_limit(interaction=interaction, msg=out_msg)
 
+    async def websites(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
+
+        # Say to the user that the command is being processed
+        await interaction.response.defer()
+
+        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)
+
+            # Respond to the user
+            await self._interaction_followup_send_no_limit(interaction=interaction, msg=out_msg)
+        except Exception as e:
+            out_msg = f"**Internal error during websites access check **:\n```sh\n{e}\n```"
+            logging.exception(msg=out_msg)
+            await self._interaction_followup_send_no_limit(interaction=interaction, msg=out_msg)
+
     async def certificates(self, interaction: discord.Interaction) -> None:
         if not self._check_if_valid_guild(guild=interaction.guild):
             return
@@ -579,7 +600,7 @@ class DiscordBotLinuxMonitor:
         await interaction.response.defer()
 
         try:
-            out_msg: str = self.monitoring.reboot_server()
+            out_msg: str = await self.monitoring.reboot_server()
             await self._interaction_followup_send_no_limit(interaction=interaction, msg=out_msg)
 
         except Exception as e:
@@ -598,7 +619,7 @@ class DiscordBotLinuxMonitor:
 
         try:
             is_private: bool = self._is_private_channel(channel=interaction.channel) # type: ignore
-            out_msg: str = self.monitoring.check_all_services_status(is_private=is_private)
+            out_msg: str = await self.monitoring.check_all_services_status(is_private=is_private)
 
             # Respond to the user
             await self._interaction_followup_send_no_limit(interaction=interaction, msg=out_msg)
@@ -619,7 +640,7 @@ class DiscordBotLinuxMonitor:
         try:
             # Restart all services and get the results
             is_private: bool = self._is_private_channel(channel=interaction.channel) # type: ignore
-            out_msg: str = self.monitoring.restart_all_services(is_private=is_private)
+            out_msg: str = await self.monitoring.restart_all_services(is_private=is_private)
 
             # Respond to the user
             await self._interaction_followup_send_no_limit(interaction=interaction, msg=out_msg)
@@ -640,7 +661,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 = 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)
 
             # Répondre à l'utilisateur
             await self._interaction_followup_send_no_limit(interaction=interaction, msg=out_msg)
@@ -683,7 +704,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 = self.monitoring.check_all_ports(restart_if_down=True, is_private=is_private, display_only_if_critical=False)
+            out_msg: str = await self.monitoring.check_all_ports(restart_if_down=True, 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)
@@ -729,7 +750,7 @@ class DiscordBotLinuxMonitor:
 
         try:
             # Arrêter le processus et récupérer le message de sortie
-            out_msg: str = self.monitoring.kill_process(pid=pid)
+            out_msg: str = await self.monitoring.kill_process(pid=pid)
 
             # Répondre à l'utilisateur
             await self._interaction_followup_send_no_limit(interaction=interaction, msg=out_msg)

{discordbotlinuxmonitor-1.0.3 → discordbotlinuxmonitor-1.2.1}/setup.py

@@ -6,11 +6,11 @@ with io.open(file='README.md', mode='r', encoding='utf-8') as readme_file:
 
 setup(
     name="DiscordBotLinuxMonitor",
-    version="1.0.3",
+    version="1.2.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",
-    url='https://github.com/QuentinCG/Linux-Monitor-Python-Library',
+    url='https://github.com/QuentinCG/Discord-Bot-Linux-Monitor-Python-Library',
     packages=['discordbotlinuxmonitor'],
     author='Quentin Comte-Gaz',
     author_email='quentin@comte-gaz.com',
@@ -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",
+        "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)
         "discord.py",
         "typing",
         "asyncio",