renamed config.ini to config-template.ini

* setup-script fixed and backup added
  * fixed latency value problem (was sometimes string instead of float)
  * cleanup

.gitignore

@@ -1,3 +1,7 @@
 .DS_Store
 .vscode
 .env
+*.backup
+grafana-datasource.yml
+docker-compose.yml
+config-template.ini

Docker_Build/latency_monitor.py

@@ -82,7 +82,7 @@ class MyInfluxDB():
     def write(self, host, host_location, ping_response):
         self.host = host
         self.host_location = host_location
-        self.ping_response = int(ping_response)
+        self.ping_response = float(ping_response)
         self.influx_timestamp = int(time_ns())
         self.data_point = Point("latency_monitor").tag("location", self.host_location).tag("host", self.host).field("latency", self.ping_response).time(self.influx_timestamp)
         self.write_api.write(bucket=self.INFX_BUCKET,
@@ -114,7 +114,7 @@ class ThreadPing(Thread):
         self.starttime = time()
         while True:
             self.ping_response_list = ping(self.host, count=1)
-            self.ping_response = self.ping_response_list.rtt_avg_ms
+            self.ping_response = "{:.2f}".format(self.ping_response_list.rtt_avg_ms)
             self.MyDB.write(self.host, self.host_location, self.ping_response)
             sleep(self.host_timer - ((time() - self.starttime) % 1))
     

README.md

@@ -161,6 +161,14 @@ Just the certificates are missing look [here](#certificate)
 
 Now run it and mybe pick a example dashboard for grafana from [here](#grafana-dashboard-examples)
 
+#### BACKUPS FILES ???
+
+The script will backup following files if found:
+
+- *./docker-compose.yml*
+- *./grafana/provisioning/datasources/grafana-datasource.yml*
+
+
 -----
 -----
 
@@ -181,7 +189,7 @@ You need to configure Variables in following files to make the compose work:
 
 -----
 
-- **docker-compose.yml** *(was docker-compose-full_stack.yml before)*
+- **docker-compose.yml** *(generated from docker-compose-full_stack.yml)*
   - PLACE_YOUR_FQDN_HERE (3 times)
 
 -----
@@ -199,7 +207,7 @@ You need to configure Variables in following files to make the compose work:
 
 -----
 
-- **grafana/provisioning/datasources/grafana-datasource.yml**
+- **grafana/provisioning/datasources/grafana-datasource.yml** *(generated from grafana/grafana-datasource-template.yml)*
   - YOUR_ADMIN_TOKEN
   - YOUR_ORGANIZATION
   - YOUR_BUCKET_NAME
@@ -280,6 +288,14 @@ Contributors names and contact info
 
 ## Version History
 
+* v0.3
+  * setup-script fixed and backup added
+  * fixed latency value problem (was sometimes string instead of float)
+  * cleanup
+
+* v0.2b
+  * cleanup
+
 * v0.2a
     * fixed some missing variables
     * fixe a missing integer declaration in latency-monitor

latency-monitor/config.ini

@@ -1,35 +0,0 @@
-# Config File Usage
-# 
-# all MUST options are marked with #!!! and have to be configured
-#
-# Config file ist IGNORED if equivalent environment variables are passed 
-#
-#
-
-
-[influx] # SOME are MUST; influxdb2 connection relevant options
-#!!! infx_url = http://YOUR_INFLUX_DB_V2:8086
-#!!! infx_token = YOUR_INFLUX_DB_V2_API_TOKEN
-#!!! infx_bucket = YOUR_INFLUX_DB_V2_BUCKET
-#!!! infx_org = YOUR_INFLUX_DB_V2_ORGANIZATION
-# infx_batch_size = 60 # OPTIONAL; default is '60'
-# infx_flush_interval = 30_000 # OPTIONAL; default is '30_000'
-# infx_jitter_interval = 5_000 # OPTIONAL; default is '5_000'
-# infx_retry_interval = 5_000 # OPTIONAL; default is '5_000'
-
-
-[hosts] # ONE HOST is MUST, rest ist optional; IP or FQDN
-#!!! host1 = 8.8.8.8
-# host2 = 8.8.4.4
-# host3 = 1.1.1.1
-
-[hosts_timer] # OPTIONAL; ping interval in seconds; default is '5'
-# host1 = 1
-# host2 = 3
-# host3 = 5
-
-[hosts_location] # OPTIONAL; location of host; default is 'unknown'
-# host1 = Google-DNS1
-# host2 = Google-DNS2
-# host3 = Cloudflare-DNS
-

setup-full_stack.sh

@@ -1,24 +1,37 @@
 #!/bin/bash
 
-# Check if .env allready exists
+Date=`date +%Y%m%d_%H%M%s`
-if ! test -e .env; then
-    echo "FAIL: You need to copy file env to .env and edit it!!!"
-    exit 1
-fi
-
-# copy compose template to final compose file (OVERWRITTEN!!!) 
-cp -f ./docker-compose-full_stack.yml ./docker-compose.yml
 
 # locate my path
 MyScriptPath=`dirname $0`
 MyScriptPathContainer="$MyScriptPath/CONTAINER/"
 
+# Check if .env allready exists
+if ! test -e $MyScriptPath/.env; then
+    echo "FAIL: You need to copy file env to .env and edit it!!!"
+    exit 1
+fi
+
+# backup old compose files
+cp -f $MyScriptPath/docker-compose.yml $MyScriptPath/docker-compose-$Date.backup
+# copy compose template to final compose file (OVERWRITTEN!!!) 
+cp -f $MyScriptPath/docker-compose-full_stack.yml $MyScriptPath/docker-compose.yml
+
+# Make relevant grafana templating direcotries
+echo "MKDIR: creating $MyScriptPath/grafana/provisioning/datasources"
+mkdir -p $MyScriptPath/grafana/provisioning/datasources
+# backup old grafana datasource file
+cp -f $MyScriptPath/grafana/provisioning/datasources/grafana-datasource.yml $MyScriptPath/grafana/grafana-datasource-$Date.backup
+# copy grafana datasource file template to grafana datasource file
+cp -f $MyScriptPath/grafana/grafana-datasource-template.yml $MyScriptPath/grafana/provisioning/datasources/grafana-datasource.yml
+
+
 # Replace .env MyPath Path with local path if NOT changed
-sed -i -e "s#/YOUR_PATH_TO_CONTAINER_STATIC_DATA#$MyScriptPathContainer#g" .env
+sed -i -e "s#/YOUR_PATH_TO_CONTAINER_STATIC_DATA#$MyScriptPathContainer#g" $MyScriptPath/.env
 
 
 # Read variables from .env file
-source .env
+source $MyScriptPath/.env
 
 echo "INFO: MyPath is $MyPath"
 
@@ -35,6 +48,8 @@ echo "CHANGE: replace PLACE_YOUR_FQDN_HERE with $MyFQDN in $MyScriptPath/docker-
 sed -i -e "s/PLACE_YOUR_FQDN_HERE/$MyFQDN/g" $MyScriptPath/docker-compose.yml
 
 # Changes in grafana/provisioning/datasources/grafana-datasource.yml
+echo "CHANGE: replace YOUR_INFLUXDB_URL with $INFLUX_URL in $MyScriptPath/grafana/provisioning/datasources/grafana-datasource.yml"
+sed -i -e "s#YOUR_INFLUXDB_URL#$INFLUX_URL#g" $MyScriptPath/grafana/provisioning/datasources/grafana-datasource.yml
 echo "CHANGE: replace YOUR_ADMIN_TOKEN with $INFLUX_TOKEN in $MyScriptPath/grafana/provisioning/datasources/grafana-datasource.yml"
 sed -i -e "s/YOUR_ADMIN_TOKEN/$INFLUX_TOKEN/g" $MyScriptPath/grafana/provisioning/datasources/grafana-datasource.yml
 echo "CHANGE: replace YOUR_ORGANIZATION with $INFLUX_ORG in $MyScriptPath/grafana/provisioning/datasources/grafana-datasource.yml"
@@ -45,6 +60,8 @@ sed -i -e "s/YOUR_BUCKET_NAME/$INFLUX_BUCKET/g" $MyScriptPath/grafana/provisioni
 # Correct owner and permissions to satisfy the containers
 echo "CHMOD: chmod -R 755 $MyPath"
 chmod -R 755 $MyPath
+echo "CHMOD: chmod -R 755 $MyScriptPath/grafana/provisioning"
+chmod -R 755 $MyScriptPath/grafana/provisioning 
 echo "CHMOD: chmod 644 $MyScriptPath/grafana/provisioning/datasources/grafana-datasource.yml"
 chmod 644 $MyScriptPath/grafana/provisioning/datasources/grafana-datasource.yml
 echo "CHOWN: chown -R 472.472 $MyPath/grafana/var_lib"