added missing interval

diff --git a/temp3.sh b/temp3.sh
index 8e5be2b..6de1e57 100755 (executable)
--- a/temp3.sh
+++ b/temp3.sh
@@ -1,29 +1,5 @@
 #!/bin/sh
 
-curl -G 'http://10.60.0.92:8086/query' --data-urlencode "db=rtl_433" --data-urlencode "q=SELECT time,id,temperature_C,humidity FROM \"Prologue-TH\"" -H "Accept: application/csv" --data-urlencode "epoch=s" \
-       | tee /dev/shm/rtl_433.th \
-       | awk -F, '{print $3" "$5" "$6 > "/dev/shm/id."$4 }'
-
-rename_ids() {
-       to=$1
-       rm /dev/shm/data.$to
-       shift
-       while [ ! -z "$1" ] ; do
-               if [ -e /dev/shm/id.$1 ] ; then
-                       cat /dev/shm/id.$1 > /dev/shm/data.$to
-                       rm  /dev/shm/id.$1
-               fi
-               shift
-       done
-}
-
-rename_ids     'vani-t-h' 0 165 234
-rename_ids     'kutija-t-h' 104 228 241 # hlad
-rename_ids     'kupaona-t-h' 114 98
-rename_ids     'kuhinja-t-h' 199 27
-rename_ids     'soba-t-h' 59 252
-
-
 # sudo apt-get install jq
 # ln -s `pwd`/temp3.sh /var/www/html/temp3.sh 
 # ln -s /dev/shm/temp3.png /var/www/html/temp3.png 
@@ -74,6 +50,30 @@ curl -G 'http://10.60.0.89:8086/query' --data-urlencode "db=telegraf" --data-url
 __SHELL__
 }
 
+curl -G 'http://10.60.0.92:8086/query' --data-urlencode "db=rtl_433" --data-urlencode "q=SELECT time,id,temperature_C,humidity FROM \"Prologue-TH\" WHERE time > now() - $INTERVAL" -H "Accept: application/csv" --data-urlencode "epoch=s" \
+       | tee /dev/shm/rtl_433.th \
+       | awk -F, '{print $3" "$5" "$6 > "/dev/shm/id."$4 }'
+
+rename_ids() {
+       to=$1
+       rm /dev/shm/data.$to
+       shift
+       while [ ! -z "$1" ] ; do
+               if [ -e /dev/shm/id.$1 ] ; then
+                       cat /dev/shm/id.$1 > /dev/shm/data.$to
+                       rm  /dev/shm/id.$1
+               fi
+               shift
+       done
+}
+
+rename_ids     'vani-t-h' 0 165 234
+rename_ids     'kutija-t-h' 104 228 241 # hlad
+rename_ids     'kupaona-t-h' 114 98
+rename_ids     'kuhinja-t-h' 199 27
+rename_ids     'soba-t-h' 59 252
+
+
 influx_mqtt    'stat/boiler/DS18B20/temperature'       'DS18B20-t'
 influx_mqtt    'stat/boiler/DHT22/temperature'         'DHT22-t'
 influx_mqtt    'stat/boiler/DHT22/humidity'            'DHT22-h'