diff --git a/deploy/portainer/docker-compose.yml b/deploy/portainer/docker-compose.yml index 6d497567..e546f824 100644 --- a/deploy/portainer/docker-compose.yml +++ b/deploy/portainer/docker-compose.yml @@ -24,7 +24,7 @@ x-identity-mysql-env: &identity-mysql-env VEHICLE_IDENTITY_MYSQL_PASSWORD: ${MYSQL_PASSWORD:-} x-redis-session-env: &redis-session-env - REDIS_HOST: ${REDIS_HOST:-r-bp1u741kij7e51i481pd.redis.rds.aliyuncs.com} + REDIS_HOST: ${REDIS_HOST:-r-bp1u741kij7e51i481.redis.rds.aliyuncs.com} REDIS_PORT: ${REDIS_PORT:-6379} REDIS_DATABASE: ${REDIS_DATABASE:-50} REDIS_USERNAME: ${REDIS_USERNAME:-} diff --git a/modules/apps/vehicle-analytics-app/pom.xml b/modules/apps/vehicle-analytics-app/pom.xml index fb1eea4b..f5668637 100644 --- a/modules/apps/vehicle-analytics-app/pom.xml +++ b/modules/apps/vehicle-analytics-app/pom.xml @@ -17,6 +17,10 @@ com.lingniu.ingest ingest-api + + com.lingniu.ingest + observability + com.lingniu.ingest sink-kafka diff --git a/modules/apps/vehicle-history-app/pom.xml b/modules/apps/vehicle-history-app/pom.xml index ba77b0a2..7a9719d2 100644 --- a/modules/apps/vehicle-history-app/pom.xml +++ b/modules/apps/vehicle-history-app/pom.xml @@ -17,6 +17,10 @@ com.lingniu.ingest ingest-api + + com.lingniu.ingest + observability + com.lingniu.ingest sink-kafka diff --git a/modules/apps/vehicle-history-app/src/test/java/com/lingniu/ingest/historyapp/MavenModuleProfileTest.java b/modules/apps/vehicle-history-app/src/test/java/com/lingniu/ingest/historyapp/MavenModuleProfileTest.java index b3f4f2e6..a4112bdd 100644 --- a/modules/apps/vehicle-history-app/src/test/java/com/lingniu/ingest/historyapp/MavenModuleProfileTest.java +++ b/modules/apps/vehicle-history-app/src/test/java/com/lingniu/ingest/historyapp/MavenModuleProfileTest.java @@ -324,13 +324,11 @@ class MavenModuleProfileTest { } @Test - void consumerAppsDoNotDependOnPipelineObservabilityInterceptor() throws Exception { - for (String appPom : List.of( - "modules/apps/vehicle-history-app/pom.xml", - "modules/apps/vehicle-analytics-app/pom.xml")) { + void activeAppsDependOnSharedObservabilityForHealthAndMetrics() throws Exception { + for (String appPom : ACTIVE_APP_POMS) { assertThat(hasDependency(modulePom(appPom), "com.lingniu.ingest", "observability")) - .as(appPom + " is a Kafka consumer/query runtime, not an ingest pipeline runtime") - .isFalse(); + .as(appPom + " exposes actuator health/readiness and Prometheus metrics") + .isTrue(); } } diff --git a/modules/apps/vehicle-history-app/src/test/java/com/lingniu/ingest/historyapp/PortainerComposeResourceLimitsTest.java b/modules/apps/vehicle-history-app/src/test/java/com/lingniu/ingest/historyapp/PortainerComposeResourceLimitsTest.java index f937f979..0c699fd0 100644 --- a/modules/apps/vehicle-history-app/src/test/java/com/lingniu/ingest/historyapp/PortainerComposeResourceLimitsTest.java +++ b/modules/apps/vehicle-history-app/src/test/java/com/lingniu/ingest/historyapp/PortainerComposeResourceLimitsTest.java @@ -91,6 +91,15 @@ class PortainerComposeResourceLimitsTest { .contains("JAVA_OPTS: ${JAVA_OPTS:---sun-misc-unsafe-memory-access=allow -XX:+UseZGC -XX:MaxRAMPercentage=75}"); } + @Test + void redisSessionDefaultsUseEcsPrivateEndpoint() throws IOException { + String compose = Files.readString(repositoryRoot().resolve("deploy/portainer/docker-compose.yml")); + + assertThat(compose) + .contains("REDIS_HOST: ${REDIS_HOST:-r-bp1u741kij7e51i481.redis.rds.aliyuncs.com}") + .doesNotContain("r-bp1u741kij7e51i481pd.redis.rds.aliyuncs.com"); + } + @Test void activeAppsExposeHealthProbeGroupsByDefault() { Path root = repositoryRoot();