diff --git a/cameleer3-server-app/src/main/resources/application.yml b/cameleer3-server-app/src/main/resources/application.yml index 31974bae..26ca2f2d 100644 --- a/cameleer3-server-app/src/main/resources/application.yml +++ b/cameleer3-server-app/src/main/resources/application.yml @@ -3,10 +3,13 @@ server: spring: datasource: - url: jdbc:ch://localhost:8123/cameleer3 + url: jdbc:postgresql://localhost:5432/cameleer3 username: cameleer - password: cameleer_dev - driver-class-name: com.clickhouse.jdbc.ClickHouseDriver + password: ${CAMELEER_DB_PASSWORD:cameleer_dev} + driver-class-name: org.postgresql.Driver + flyway: + enabled: true + locations: classpath:db/migration mvc: async: request-timeout: -1 @@ -29,8 +32,14 @@ ingestion: batch-size: 5000 flush-interval-ms: 1000 -clickhouse: - ttl-days: 30 +opensearch: + url: ${OPENSEARCH_URL:http://localhost:9200} + queue-size: ${CAMELEER_OPENSEARCH_QUEUE_SIZE:10000} + debounce-ms: ${CAMELEER_OPENSEARCH_DEBOUNCE_MS:2000} + +cameleer: + body-size-limit: ${CAMELEER_BODY_SIZE_LIMIT:16384} + retention-days: ${CAMELEER_RETENTION_DAYS:30} security: access-token-expiry-ms: 3600000 diff --git a/cameleer3-server-app/src/test/resources/application-test.yml b/cameleer3-server-app/src/test/resources/application-test.yml index 027a4f67..b450bee4 100644 --- a/cameleer3-server-app/src/test/resources/application-test.yml +++ b/cameleer3-server-app/src/test/resources/application-test.yml @@ -1,18 +1,5 @@ spring: - datasource: - url: jdbc:ch://placeholder:8123/cameleer3 - username: default - password: "" - driver-class-name: com.clickhouse.jdbc.ClickHouseDriver - -ingestion: - buffer-capacity: 100 - batch-size: 10 - flush-interval-ms: 100 - -agent-registry: - ping-interval-ms: 1000 - -security: - bootstrap-token: test-bootstrap-token - bootstrap-token-previous: old-bootstrap-token + flyway: + enabled: true +opensearch: + url: http://localhost:9200