time handling

.gitlab-ci.yml

@@ -39,16 +39,17 @@ deploy:
       -d
       --name $CONTAINER_NAME
       --restart always
-      --link timescaledb-server
+      --network internal-network
       -e "APPLICATION_TENANT=$APPLICATION_TENANT"
       -e "MQTT_LOGIN=$MQTT_LOGIN"
       -e "MQTT_PASSWORD=$MQTT_PASSWORD"
       -e "MQTT_BROKER=$MQTT_BROKER"
-      -e "PGHOST=timescaledb-server"
+      -e "PGHOST=timescaledb"
       -e "PGUSER=$PGUSER"
       -e "PGPASSWORD=$PGPASSWORD"
       -e "PGDATABASE=$PGDATABASE"
       $IMAGE_NAME:$CI_COMMIT_TAG
+    - docker network connect external-network $CONTAINER_NAME
   environment:
     name: production
 

schema/create-schema.sql

@@ -1,3 +1,6 @@
+create database monitoring;
+create extension timescaledb;
+
 CREATE TABLE device_t (
     id SERIAL NOT NULL PRIMARY KEY,
     device_id VARCHAR(32) NOT NULL UNIQUE,

src/preprocess.py

@@ -70,8 +70,8 @@ class DbOp(object):
             with conn:
                 with conn.cursor() as cur:
                     for entry in measurement['measurements']:
-                        cur.execute("insert into measurement_t (time, device_name, sensor_name, temperature) values (%(time)s, %(dname)s, %(sname)s, %(tempc)s)",
+                        cur.execute("insert into measurement_t (time, device_name, sensor_name, temperature) values (now(), %(dname)s, %(sname)s, %(tempc)s)",
-                                    { 'time': measurement['time'], 'dname': measurement['label'], 'sname': entry['label'], 'tempc': entry['value'] })
+                                    { 'dname': measurement['label'], 'sname': entry['label'], 'tempc': entry['value'] })
         except Exception as e:
             logger.error(f"Error storing measurement: {e}")
         finally: