Progress on influxdb and templated queries/variables, #613