chore: align observability and redis defaults
This commit is contained in:
@@ -24,7 +24,7 @@ x-identity-mysql-env: &identity-mysql-env
|
|||||||
VEHICLE_IDENTITY_MYSQL_PASSWORD: ${MYSQL_PASSWORD:-}
|
VEHICLE_IDENTITY_MYSQL_PASSWORD: ${MYSQL_PASSWORD:-}
|
||||||
|
|
||||||
x-redis-session-env: &redis-session-env
|
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_PORT: ${REDIS_PORT:-6379}
|
||||||
REDIS_DATABASE: ${REDIS_DATABASE:-50}
|
REDIS_DATABASE: ${REDIS_DATABASE:-50}
|
||||||
REDIS_USERNAME: ${REDIS_USERNAME:-}
|
REDIS_USERNAME: ${REDIS_USERNAME:-}
|
||||||
|
|||||||
@@ -17,6 +17,10 @@
|
|||||||
<groupId>com.lingniu.ingest</groupId>
|
<groupId>com.lingniu.ingest</groupId>
|
||||||
<artifactId>ingest-api</artifactId>
|
<artifactId>ingest-api</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>com.lingniu.ingest</groupId>
|
||||||
|
<artifactId>observability</artifactId>
|
||||||
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.lingniu.ingest</groupId>
|
<groupId>com.lingniu.ingest</groupId>
|
||||||
<artifactId>sink-kafka</artifactId>
|
<artifactId>sink-kafka</artifactId>
|
||||||
|
|||||||
@@ -17,6 +17,10 @@
|
|||||||
<groupId>com.lingniu.ingest</groupId>
|
<groupId>com.lingniu.ingest</groupId>
|
||||||
<artifactId>ingest-api</artifactId>
|
<artifactId>ingest-api</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>com.lingniu.ingest</groupId>
|
||||||
|
<artifactId>observability</artifactId>
|
||||||
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.lingniu.ingest</groupId>
|
<groupId>com.lingniu.ingest</groupId>
|
||||||
<artifactId>sink-kafka</artifactId>
|
<artifactId>sink-kafka</artifactId>
|
||||||
|
|||||||
@@ -324,13 +324,11 @@ class MavenModuleProfileTest {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
void consumerAppsDoNotDependOnPipelineObservabilityInterceptor() throws Exception {
|
void activeAppsDependOnSharedObservabilityForHealthAndMetrics() throws Exception {
|
||||||
for (String appPom : List.of(
|
for (String appPom : ACTIVE_APP_POMS) {
|
||||||
"modules/apps/vehicle-history-app/pom.xml",
|
|
||||||
"modules/apps/vehicle-analytics-app/pom.xml")) {
|
|
||||||
assertThat(hasDependency(modulePom(appPom), "com.lingniu.ingest", "observability"))
|
assertThat(hasDependency(modulePom(appPom), "com.lingniu.ingest", "observability"))
|
||||||
.as(appPom + " is a Kafka consumer/query runtime, not an ingest pipeline runtime")
|
.as(appPom + " exposes actuator health/readiness and Prometheus metrics")
|
||||||
.isFalse();
|
.isTrue();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -91,6 +91,15 @@ class PortainerComposeResourceLimitsTest {
|
|||||||
.contains("JAVA_OPTS: ${JAVA_OPTS:---sun-misc-unsafe-memory-access=allow -XX:+UseZGC -XX:MaxRAMPercentage=75}");
|
.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
|
@Test
|
||||||
void activeAppsExposeHealthProbeGroupsByDefault() {
|
void activeAppsExposeHealthProbeGroupsByDefault() {
|
||||||
Path root = repositoryRoot();
|
Path root = repositoryRoot();
|
||||||
|
|||||||
Reference in New Issue
Block a user