influx_rtl() {
file=$1
shift;
- rids=`echo $* | sed -e 's/\([0-9][0-9]*\)/ or id = '"'"'\1'"'"'/g' -e 's/^ or/ AND /'`
+ rids=`echo $* | sed -e 's/\([0-9][0-9]*\)/ or id = '"'"'\1'"'"'/g' -e 's/^ or//'`
# echo "# $topic [$rids] -> $file"
cat <<__SHELL__ >> /dev/shm/curl
-curl -G 'http://10.60.0.89:8086/query' --data-urlencode "db=telegraf" --data-urlencode "epoch=s" --data-urlencode "q=SELECT \"temperature_C\",\"humidity\" FROM \"mqtt_rtl_433\" WHERE time > now() - $INTERVAL and model='Prologue-TH' $rids" | sed -e 's/^.*"values":\[\[//' -e 's/\],\[/\n/g' -e 's/,/ /g' -e 's/]].*$//' > /dev/shm/data.$file
+curl -G 'http://10.60.0.89:8086/query' --data-urlencode "db=telegraf" --data-urlencode "epoch=s" --data-urlencode "q=SELECT \"temperature_C\",\"humidity\" FROM \"mqtt_rtl_433\" WHERE time > now() - $INTERVAL and model='Prologue-TH' AND ( $rids )" | sed -e 's/^.*"values":\[\[//' -e 's/\],\[/\n/g' -e 's/,/ /g' -e 's/]].*$//' > /dev/shm/data.$file
__SHELL__
}
influx_mqtt 'stat/boiler/DHT22/humidity' 'DHT22-h'
influx_tele 'tele/ir/SENSOR' 'AM2301_Temperature' 'AM2301_Humidity' 'ir-dht22-t-h'
+influx_tele 'tele/dht11-ir-hdmi/SENSOR' 'DHT11_Temperature' 'DHT11_Humidity' 'stol-dht11-t-h'
influx_mqtt 'stat/boiler/d' 'boiler-d'
-influx_rtl 'vani-t-h' 0 165
-influx_rtl 'kutija-t-h' 95 90 82
-influx_rtl 'kupaona-t-h' 125 148 133
-influx_rtl 'kuhinja-t-h' 239 83
-influx_rtl 'soba-t-h' 59
+influx_rtl 'vani-t-h' 0 165
+influx_rtl 'kutija-t-h' 82 104 228
+influx_rtl 'kupaona-t-h' 122 114
+influx_rtl 'kuhinja-t-h' 199 27
+influx_rtl 'soba-t-h' 59 252
cat /dev/shm/curl | parallel