fixes of setup script, creating better template files, ensure coorect latency output to influx

.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 = 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

@@ -1,6 +1,6 @@
 # Docker Based Latency Monitor
 
-Docker container which tracks latency of one or many hosts and reports to InfluxDBv2.
+Docker container(s) which tracks latency of one or many hosts and reports to InfluxDBv2.
 
 ## Description
 
@@ -31,7 +31,7 @@ You can use it in *standalone* or *full stack* mode.
 
 ## Requirements
 
-- Docker
+- Docker (CE)
 - Docker-Compose
 - InfluxDB Version >= 2
 - pythonping needs root privileges so same for the container
@@ -47,9 +47,9 @@ Also some influx connection options are just configurable via config file but no
 
 ### Behaviour 
 
-Per default the python influx connector will cache all replies and sends them bundled every 30 seconds to the Influx DB.
+Per default the used python influxdb connector will cache all replies and sends them bundled every 30 seconds to the Influx DB.
 
-The container will be build at 1st start.
+Actually the latency-monitor container is build on demand, a dockerhub image is on the roadmap...
 
 You can find everything under *./Docker_Build/* and in the python program itself [latency_monitor.py](./Docker_Build/latency_monitor.py)
 
@@ -97,7 +97,7 @@ docker latency-monitor -v ./latency-monitor/config.ini:/app/config.ini:ro
 
 ## Configuration (Standalone)
 
-1st thing to do is creating the *docker-compose.yml from [docker-compose-standalone.yml](./docker-compose-standalone.yml):
+1st thing to do is creating the *docker-compose.yml* from [docker-compose-standalone.yml](./docker-compose-standalone.yml):
 
 ```
 cp docker-compose-standalone.yml docker-compose.yml
@@ -147,7 +147,7 @@ Just create a valid *.env* File by:
 cp env .env
 ```
 
-and editing it to your needs.
+and edit it to your needs.
 
 After everyting within *.env* is in order just do:
 
@@ -159,10 +159,14 @@ Everything should be right in place now.
 
 Just the certificates are missing look [here](#certificate)
 
+Now run it and mybe pick a example dashboard for grafana from [here](#grafana-dashboard-examples)
+
 -----
 -----
 
-### WTF maual mode
+### WTF manual mode
+
+REALLY???
 
 You need to set all on your own:
 
@@ -228,6 +232,8 @@ Everything should be right in place now.
 
 Just the certificates are missing look [here](#certificate)
 
+Now run it and mybe pick a example dashboard for grafana from [here](#grafana-dashboard-examples)
+
 -----
 -----
 
@@ -253,7 +259,7 @@ Thats it
 
 ## Grafana Dashboard Examples
 
-Within the local path *./examples/grafana/*  you can find example *.json* files which can be imported to grafana as dashboards to give you a first point to start with.
+Within the local path [./examples/grafana/](./examples/grafana/) you can find example *.json* files which can be imported to grafana as dashboards to give you a first point to start with.
 
 
 -----
@@ -274,6 +280,15 @@ Contributors names and contact info
 
 ## Version History
 
+* v0.2b
+  * cleanup
+
+* v0.2a
+    * fixed some missing variables
+    * fixe a missing integer declaration in latency-monitor
+    * added automatic config creation for full-stack
+    * cleanups
+
 * v0.1
     * Initial Release
 

setup-full_stack.sh

@@ -1,24 +1,39 @@
 #!/bin/bash
 
-# Check if .env allready exists
-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
+Date=`date +%Y%m%d_%H%M%s`
 
 # 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
-echo "CHANGE: while not set, changing MyPath in .env to $MyScriptPathContainer"
-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"
 
 # Make relevant direcotries
 echo "MKDIR: creating $MyPath"
@@ -33,9 +48,11 @@ 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 YYOUR_ORGANIZATION with $INFLUX_ORG in $MyScriptPath/grafana/provisioning/datasources/grafana-datasource.yml"
+echo "CHANGE: replace YOUR_ORGANIZATION with $INFLUX_ORG in $MyScriptPath/grafana/provisioning/datasources/grafana-datasource.yml"
 sed -i -e "s/YOUR_ORGANIZATION/$INFLUX_ORG/g" $MyScriptPath/grafana/provisioning/datasources/grafana-datasource.yml
 echo "CHANGE: replace YOUR_BUCKET_NAME with $INFLUX_BUCKET in $MyScriptPath/grafana/provisioning/datasources/grafana-datasource.yml"
 sed -i -e "s/YOUR_BUCKET_NAME/$INFLUX_BUCKET/g" $MyScriptPath/grafana/provisioning/datasources/grafana-datasource.yml
@@ -43,8 +60,10 @@ 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 644 $MyScriptPath/grafana/datasources/grafana-datasource.yml"
-chmod 644 $MyScriptPath/grafana/datasources/grafana-datasource.yml
+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"
 chown -R 472.472 $MyPath/grafana/var_lib