Changes to accomodate speedtest

Author: securedpackets

.env

@@ -43,15 +43,13 @@ threshold_dns_latency = "100" # 100ms dns latency threshold as max
 # - This configuration is for setting up a "speed test" or rather a test of your internet bandwidth.
 # - In order to test your upload and download bandwidth we use speedtest.net as source. So your client will connect there and upload and download some data.
 # - That also means that a random server is selected for the test (usually the nearest one)
-SPEEDTEST_ENABLED="False" # set this to "True" to enable bandwidth test at all
-SPEEDTEST_INTERVAL_MULTIPLIER="60" # multiplier for the test to be executed because you probably don't want to constantly test your download speed (will be a multiple of "PROBE_INTERVAL") so defaults to 30 minutes
+# - Setting the SPEEDTEST_INTERVAL too agressively will cause speedtest.net to block your requests, recommend 15 minutes (900 seconds) and above
+SPEEDTEST_ENABLED="True" # set this to "True" to enable speed test function
+SPEEDTEST_INTERVAL="937" # interval on which the speedtest will run, in seconds - note using a prime number helps reduce the number of collisions between netprobe and speed tests
 
 
 # SYSTEM VARIABLES - DO NOT TOUCH
 
-DEVICE_ID="44c42e36-f2eb-44d0-babc-1a749498e016"
-SITE_ID="f0ac2f33-1a20-471d-b430-d905900e0e71"
-
 PRESENTATION_PORT = "5000"
 PRESENTATION_INTERFACE = "0.0.0.0"
 

compose.yml

@@ -14,28 +14,51 @@ services:
       - ./config/redis/redis.conf:/etc/redis/redis.conf
     networks:
       - netprobe-net
+    dns:
+      - 8.8.8.8
+      - 8.8.4.4      
 
   netprobe:
     restart: always
     container_name: netprobe-probe
-    image: "plaintextpackets/netprobe:latest"
+    image: "plaintextpacket/netprobe:latest"
     volumes:
       - .:/netprobe_lite
     environment:
       MODULE: "NETPROBE"
     networks:
       - netprobe-net
+    dns:
+      - 8.8.8.8
+      - 8.8.4.4      
+
+  speedtest:
+    restart: always
+    container_name: netprobe-speedtest
+    image: "plaintextpacket/netprobe:latest"
+    volumes:
+      - .:/netprobe_lite
+    environment:
+      MODULE: "SPEEDTEST"
+    networks:
+      - netprobe-net
+    dns:
+      - 8.8.8.8
+      - 8.8.4.4      
 
   presentation:
     restart: always
     container_name: netprobe-presentation
-    image: "plaintextpackets/netprobe:latest"
+    image: "plaintextpacket/netprobe:latest"
     volumes:
       - .:/netprobe_lite
     environment:
       MODULE: "PRESENTATION"
     networks:
       - netprobe-net
+    dns:
+      - 8.8.8.8
+      - 8.8.4.4      
 
   prometheus:
     restart: always
@@ -49,6 +72,9 @@ services:
       - '--storage.tsdb.path=/prometheus'
     networks:
       - netprobe-net
+    dns:
+      - 8.8.8.8
+      - 8.8.4.4      
 
   grafana:
     restart: always
@@ -63,6 +89,9 @@ services:
       - '3001:3000'
     networks:
       - netprobe-net
+    dns:
+      - 8.8.8.8
+      - 8.8.4.4      
 
 volumes:
   prometheus_data:

config/__init__.py

@@ -15,11 +15,9 @@ class Config_Netprobe():
     probe_interval = int(os.getenv('PROBE_INTERVAL'))
     probe_count = int(os.getenv('PROBE_COUNT'))
     sites = os.getenv('SITES').split(',')
-    device_id = os.getenv('DEVICE_ID')
-    site_id = os.getenv('SITE_ID')
     dns_test_site = os.getenv('DNS_TEST_SITE')
     speedtest_enabled = os.getenv("SPEEDTEST_ENABLED", 'False').lower() in ('true', '1', 't')
-    speedtest_interval_multiplier = int(os.getenv('SPEEDTEST_INTERVAL_MULTIPLIER'))
+    speedtest_interval = int(os.getenv('SPEEDTEST_INTERVAL'))
 
     DNS_NAMESERVER_1 = os.getenv('DNS_NAMESERVER_1')
     DNS_NAMESERVER_1_IP = os.getenv('DNS_NAMESERVER_1_IP')