Merge pull request 'work' (#4) from work into main

Reviewed-on: #4

Dockerfile

@@ -1,11 +1,9 @@
-FROM debian:bullseye-slim
+FROM debian:trixie-slim
 #
-RUN apt update && apt install python3 python3-pip -y
-COPY logpingresult.py /usr/local/bin/
 COPY requirements.txt /
 COPY init.sh /
 RUN chmod +x /init.sh
+RUN apt update && apt install python3 python3-pip iputils-ping -y && pip3 install -r /requirements.txt --break-system-packages && apt clean
+COPY logpingresult.py /usr/local/bin/
 RUN chmod +x /usr/local/bin/logpingresult.py
-RUN pip3 install -r /requirements.txt
-RUN apt clean
 CMD ["/init.sh"]

docker-compose.yml

@@ -7,4 +7,5 @@ services:
       - INFLUX_USER=${INFLUX_USER}
       - INFLUX_PASSWORD=${INFLUX_PASSWORD}
       - INFLUX_URI=${INFLUX_URI}
-      - PING_HOSTS="8.8.8.8,10.0.2.1,24.220.0.10,10.2.0.1,192.168.1.25"
+      - PING_HOSTS="8.8.8.8,10.0.2.1,24.220.0.10,10.2.0.1,192.168.1.25"
+      #

logpingresult.py

@@ -1,4 +1,4 @@
-#/usr/bin/python3
+#!/usr/bin/python3
 import os
 import subprocess as sp
 import requests
@@ -19,13 +19,20 @@ infdbpass = os.environ["INFLUX_PASSWORD"]
 influxuri = os.environ["INFLUX_URI"]
 pingaddresses = os.environ["PING_HOSTS"].split(",")
 while(True):
-    for ip in pingaddresses:
-        response = sp.getstatusoutput(f"ping -c 1 {ip}")
-        if(response[0]!=0):
-            time=2000
-        else:
-            myresp = response[1].split("\n")[1].split(' ')[6].split('=')[1]
-            
-        result = addinfluxrecord(ip,myresp)
-        print(result)
-    time.sleep(5)
+    if len(pingaddresses) > 0:
+        print(pingaddresses)
+        for ip in pingaddresses:
+            print(ip)
+            response = sp.getstatusoutput(f"ping -c 1 {ip}")
+            print(response)
+            if(response[0]!=0):
+                myresp=2000
+            else:
+                myresp = response[1].split("\n")[1].split(' ')[6].split('=')[1]
+                
+            result = addinfluxrecord(ip,myresp)
+            print(result)
+        time.sleep(5)
+    else:
+        print("No Hosts Defined")
+        exit