1、适配部署环境变量自动注入
2、适配南网达梦数据库安全版SQL语句Group by 不支持自定义函数 3、达梦数据库驱动改为达梦提供的指定版本 4、修改syslog-consumer模块yaml 文件kafka 变量名称 5、修改访问日志告警表新增4个字段,完善异常行为详情页面显示字段
This commit is contained in:
@@ -12,58 +12,57 @@ services:
|
||||
# ============================================
|
||||
syslog-serve:
|
||||
build:
|
||||
context: ./syslog-serve
|
||||
context: ./serve-dm
|
||||
dockerfile: Dockerfile
|
||||
image: syslog-serve:1.0.1
|
||||
container_name: syslog-serve
|
||||
image: syslog-serve-dm:v1.2.1
|
||||
container_name: syslog-serve-dm
|
||||
restart: unless-stopped
|
||||
environment:
|
||||
# 环境配置
|
||||
- SPRING_PROFILES_ACTIVE=prod
|
||||
- TZ=Asia/Shanghai
|
||||
# 探针标识
|
||||
- DEVICE_COLLECT_ID=probe-001
|
||||
# 探针标识ID
|
||||
- APP_SERVICE_DEVICE_COLLECT_ID=1
|
||||
# 数据库配置
|
||||
- spring.datasource.url=jdbc:postgresql://117.72.68.72:54329/ecosys
|
||||
- spring.datasource.username=postgres
|
||||
- spring.datasource.password=TnLanWaidYSwTSG5
|
||||
- spring.datasource.driver-class-name=org.postgresql.Driver
|
||||
- SPRING_DATASOURCE_URL=jdbc:dm://192.168.4.99:5237
|
||||
- SPRING_DATASOURCE_USERNAME=SYSDBA
|
||||
- SPRING_DATASOURCE_PASSWORD=caZ2TcmXNSW8L2Ap
|
||||
- SPRING_DATASOURCE_DRIVER_CLASS_NAME=dm.jdbc.driver.DmDriver
|
||||
- SPRING_DATASOURCE_HIKARI_SCHEMA=\"PUBLIC\"
|
||||
|
||||
# Redis配置
|
||||
- spring.redis.host=127.0.0.1
|
||||
- spring.redis.port=6379
|
||||
- spring.redis.password=
|
||||
- spring.redis.database=0
|
||||
- spring.redis.timeout=2000
|
||||
- spring.cache.redis.time-to-live=600000
|
||||
- SPRING_REDIS_HOST=192.168.4.99
|
||||
- SPRING_REDIS_PORT=6379
|
||||
- SPRING_REDIS_PASSWORD=redis_GdGWte
|
||||
- SPRING_REDIS_DATABASE=0
|
||||
- SPRING_REDIS_TIMEOUT=2000
|
||||
- SPRING_CACHE_REDIS_TIME_TO_LIVE=600000
|
||||
# Kafka配置
|
||||
- spring.kafka.producer.bootstrap-servers=192.168.222.130:9092
|
||||
- spring.kafka.producer.topic=test-topic
|
||||
# 防火墙配置
|
||||
- firewall.enabled=true
|
||||
- firewall.api-key=your-secure-api-key
|
||||
- SPRING_KAFKA_PRODUCER_BOOTSTRAP_SERVERS=192.168.4.99:9092
|
||||
- SPRING_KAFKA_PRODUCER_TOPIC=agent-01-syslog-topic
|
||||
# 防火墙配置
|
||||
- FIREWALL_ENABLED=true
|
||||
- FIREWALL_API_KEY=your-secure-api-key
|
||||
# 联动配置 (syslog-consumer 地址)
|
||||
- interlocking.enabled=true
|
||||
- interlocking.api.base-url=http://117.72.68.72:8089/xdrservice/interlocking
|
||||
- interlocking.api-key=a1b2c3d4e5f6g7h8i9j0k1l2m3n4o5p6
|
||||
- INTERLOCKING_ENABLED=true
|
||||
- INTERLOCKING_API_BASE_URL=http://192.168.4.99:8089/xdrservice/interlocking
|
||||
- INTERLOCKING_API_KEY=a1b2c3d4e5f6g7h8i9j0k1l2m3n4o5p6
|
||||
# 探针心跳配置
|
||||
- probe.heartbeat.enabled=true
|
||||
- probe.heartbeat.interval-seconds=60
|
||||
- probe.heartbeat.initial-delay-ms=5000
|
||||
- probe.collect-id=probe-001
|
||||
- probe.collect-name=日志采集探针
|
||||
- probe.app-version=1.0.0
|
||||
- probe.platform.api-url=http://117.72.68.72:8089/xdrservice/interlocking/probe/heartbeat
|
||||
- probe.platform.api-key=a1b2c3d4e5f6g7h8i9j0k1l2m3n4o5p6
|
||||
- PROBE_HEARTBEAT_ENABLED=true
|
||||
- PROBE_HEARTBEAT_INTERVAL_SECONDS=60
|
||||
- PROBE_HEARTBEAT_INITIAL_DELAY_MS=5000
|
||||
- PROBE_PLATFORM_API_URL=http://192.168.4.99:8089/xdrservice/interlocking/probe/heartbeat
|
||||
|
||||
# 定时任务配置
|
||||
- spring.task.scheduling.pool.size=5
|
||||
- SPRING_TASK_SCHEDULING_POOL_SIZE=5
|
||||
# JVM配置
|
||||
- JAVA_OPTS=-Xms256m -Xmx512m -XX:+UseG1GC
|
||||
- JAVA_OPTS=-Xms2048m -Xmx4096m -XX:+UseG1GC
|
||||
ports:
|
||||
- "8189:8189" # API端口
|
||||
- "514:514/udp" # Syslog UDP
|
||||
- "514:514/tcp" # Syslog TCP
|
||||
volumes:
|
||||
- syslog-serve-logs:/app/logs
|
||||
- /home/syslog/logs:/app/logs
|
||||
networks:
|
||||
- xdr-network
|
||||
cap_add:
|
||||
|
||||
Reference in New Issue
Block a user