Hardcoding initial chunk_time_interval to 1 day.

MO-RISE · Aug 18, 2023 · 375398d · 375398d
1 parent 1ba9e79
commit 375398d
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 9 deletions.
diff --git a/database/docker-entrypoint-initdb.d/011-pontos-vessel-data.sql b/database/docker-entrypoint-initdb.d/011-pontos-vessel-data.sql
@@ -10,7 +10,7 @@ CREATE TABLE vessel_data.master (
    CONSTRAINT no_duplicates_key UNIQUE(time, vessel_id, parameter_id)
 );
 
-SELECT create_hypertable('vessel_data.master', 'time');
+SELECT create_hypertable('vessel_data.master', 'time', chunk_time_interval => INTERVAL '1 day');
 
 CREATE INDEX ON vessel_data.master (vessel_id, time DESC);
 CREATE INDEX ON vessel_data.master (parameter_id, time DESC);

diff --git a/docker-compose.base.yml b/docker-compose.base.yml
@@ -86,7 +86,6 @@ services:
       POSTGRES_DB: pontos
       POSTGRES_USER: pontos_user
       POSTGRES_PASSWORD: ${PONTOS_DB_PASSWORD}
-      TIMESCALEDB_CHUNK_TIME_INTERVAL: ${PONTOS_DB_INITIAL_CHUNK_TIME_INTERVAL:-'24 hours'}
     volumes:
       # Data volume
       - vol-pg-data:/var/lib/postgresql/data

diff --git a/example.env b/example.env
@@ -13,8 +13,6 @@ PONTOS_EMQX_DASHBOARD_PORT=8081                 # default: 8081
 PONTOS_TRAEFIK_LOG_LEVEL=ERROR                  # default: ERROR
 PONTOS_EMQX_LOG_LEVEL=warning                   # default: warning
 
-PONTOS_DB_INITIAL_CHUNK_TIME_INTERVAL='24 hours'    # default: '24 hours'
-
 
 
 ## HTTPS: for docker-compose.https.yml

diff --git a/tests/10-test-base-setup.bats b/tests/10-test-base-setup.bats
@@ -15,7 +15,7 @@ setup_file() {
 
 teardown_file() {
     docker compose -f docker-compose.base.yml down --remove-orphans
-    docker container prune -f && docker volume prune -f
+    docker container prune -f && docker volume prune -af
 }
 
 

diff --git a/tests/11-test-setup-persistence.bats b/tests/11-test-setup-persistence.bats
@@ -9,7 +9,7 @@ load "./bats-helpers/bats-assert/load"
 
 teardown() {
     docker compose -f docker-compose.base.yml down --remove-orphans
-    docker container prune -f && docker volume prune -f
+    docker container prune -f && docker volume prune -af
 }
 
 @test "BASE: MQTT retain persistence across reboots" {

diff --git a/tests/12-test-migrations.bats b/tests/12-test-migrations.bats
@@ -14,7 +14,7 @@ setup() {
 
 teardown() {
     docker compose -f docker-compose.base.yml down --remove-orphans
-    docker container prune -f && docker volume prune -f
+    docker container prune -f && docker volume prune -af
     rm -rf "$clone_dir"
     rm -rf "$deploy_dir"
 }

diff --git a/tests/20-test-auth-setup.bats b/tests/20-test-auth-setup.bats
@@ -15,7 +15,7 @@ setup_file() {
 
 teardown_file() {
     docker compose -f docker-compose.base.yml -f docker-compose.auth.yml down --remove-orphans
-    docker container prune -f && docker volume prune -f
+    docker container prune -f && docker volume prune -af
 }
 
 

diff --git a/tests/21-test-setup-with-custom-acl-rules.bats b/tests/21-test-setup-with-custom-acl-rules.bats
@@ -9,7 +9,7 @@ load "./bats-helpers/bats-assert/load"
 
 teardown() {
     docker compose -f docker-compose.base.yml -f docker-compose.auth.yml down --remove-orphans
-    docker container prune -f && docker volume prune -f
+    docker container prune -f && docker volume prune -af
     git checkout -- broker/acl.conf
 }