Merge branch 'csu_2023_team_3' into tsdb_master_merge

.gitignore

@@ -231,4 +231,7 @@ swag/*
 !swag/nginx/proxy-confs/dpi-device-manager.subfolder.conf
 *.pem
 
-settings.json
+settings.json
+
+#303 back up database
+backup-db/

compose/.env

@@ -15,6 +15,15 @@ PGDATABASE=broker
 POSTGRES_PASSWORD=CHANGEME
 POSTGRES_DB=broker
 
+#TSDB -- KEEP SYNCED WITH ./.tsdb_env
+TSDB_USER=postgres
+TSDB_PASSWORD=admin
+TSDB_PORT=5432
+TSDB_HOST=tsdb
+TSDB_DB=postgres
+TSDB_TABLE=timeseries      #set in init.sql
+NAMING_UPDATE_INTERVAL=600 ##how often on new message to map will it check to update word_list and type_maps
+
 # Set this to the root of the git repo as it is seen by the containers.
 PYTHONPATH=/home/broker/python
 

compose/.tsdb_env

@@ -0,0 +1,3 @@
+POSTGRES_USER=postgres
+POSTGRES_PASSWORD=admin
+POSTGRES_PORT=5432

compose/docker-compose.yml

@@ -253,6 +253,7 @@ services:
     working_dir: "/home/broker/python"
     entrypoint: [ "python", "-m", "delivery.FRRED" ]
 
+
   axistech:
     image: broker/python-base
     logging:
@@ -266,10 +267,39 @@ services:
       - frred
     depends_on:
       db:
+    entrypoint: [ "python", "-m", "pollers.axistech" ]
+
+  timescaledb:
+    build: ../timescale  # Point to the directory containing the custom Dockerfile
+    hostname: "tsdb"
+    image: custom-timescaledb:latest
+    restart: "no"    
+
+    env_file:
+      - .tsdb_env
+    volumes:
+      - ../timescale/init.sql:/docker-entrypoint-initdb.d/init.sql
+      - ../timescale/pgbackrest/pgbackrest.conf:/home/postgres/pgdata/backup/pgbackrest.conf
+      - ../timescale/logs:/var/log/timescale
+    ports:
+      - "5433:5432"
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U ${TSDB_USER}"]
+      interval: 10s
+      timeout: 5s
+      retries: 3
+
+  iota_tsdb_decoder:
+    image: broker/python-base
+    restart: "no"
+    env_file:
+      - .env
+    depends_on:
+      timescaledb:
         condition: "service_healthy"
       mq:
         condition: "service_healthy"
     volumes:
       - ../src/python:/home/broker/python
     working_dir: "/home/broker/python"
-    entrypoint: [ "python", "-m", "pollers.axistech" ]
+    entrypoint: [ "python", "-m", "timescale.TS_LTSReader" ]

compose/production/prod.yml

@@ -31,9 +31,20 @@ services:
     ports:
       - "127.0.0.1:5000:5000"
 
+  timescaledb:
+    volumes:
+      - tsdb_db:/home/postgres/pgdata/data
+      - pgbackrest_data:/var/lib/pgbackrest
+
 volumes:
   broker_db:
     external: true
 
   mq_data:
     external: true
+
+  tsdb_db:
+    external: true
+
+  pgbackrest_data:
+    external: false

compose/test/test.yml

@@ -15,3 +15,10 @@ services:
       - ..:/home/broker/broker
     working_dir: "/home/broker/broker"
     entrypoint: [ "./forever.sh" ]
+  mq:
+    ports:
+      - 15672:15672
+  restapi:
+    ports:
+      - 5687:5687
+