Sensus/SensusInfra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: Sensus:685c341c892fab0660435cb9e8aabe1bf2cfb7f3
Branches Tags
Sensus:main
..
compare: Sensus:36ed1da92af41aca674941a217ba64e7f7fcb0d5
Branches Tags
Sensus:main

No commits in common. "685c341c892fab0660435cb9e8aabe1bf2cfb7f3" and "36ed1da92af41aca674941a217ba64e7f7fcb0d5" have entirely different histories.
685c341c89 ... 36ed1da92a

3 changed files with 11 additions and 17 deletions
Show Stats Expand all files Collapse all files

2
clickhouse-config/01-cluster.xml
View File

@ -97,6 +97,6 @@
<port>5432</port>
<database>sensus</database>
<user>sensus</user>
<password>sensus</password>
<password>sensus_secure_password_2024</password>
</postgresql>
</yandex>

18
docker-compose.yml
View File

@ -36,7 +36,7 @@ services:
KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: PLAINTEXT:PLAINTEXT,PLAINTEXT_HOST:PLAINTEXT,SSL:SSL
KAFKA_LISTENERS: PLAINTEXT://0.0.0.0:29092,PLAINTEXT_HOST://0.0.0.0:9092,SSL://0.0.0.0:9093
KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://kafka:29092,PLAINTEXT_HOST://10.29.91.4:9092,SSL://10.29.91.4:9093
KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://kafka:29092,PLAINTEXT_HOST://10.99.0.90:9092,SSL://10.99.0.90:9093
KAFKA_INTER_BROKER_LISTENER_NAME: PLAINTEXT
KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1
KAFKA_TRANSACTION_STATE_LOG_MIN_ISR: 1
@ -49,11 +49,9 @@ services:
KAFKA_LOG_RETENTION_CHECK_INTERVAL_MS: ${KAFKA_LOG_RETENTION_CHECK_INTERVAL_MS:-300000}
# SSL настройки
KAFKA_SSL_KEYSTORE_LOCATION: /var/ssl/private/kafka.server.keystore.jks
KAFKA_SSL_KEYSTORE_FILENAME: kafka.server.keystore.jks
KAFKA_SSL_KEYSTORE_PASSWORD: ${KAFKA_SSL_KEYSTORE_PASSWORD:-kafka123}
KAFKA_SSL_KEY_PASSWORD: ${KAFKA_SSL_KEY_PASSWORD:-kafka123}
KAFKA_SSL_TRUSTSTORE_LOCATION: /var/ssl/private/kafka.server.truststore.jks
KAFKA_SSL_TRUSTSTORE_FILENAME: kafka.server.truststore.jks
KAFKA_SSL_TRUSTSTORE_PASSWORD: ${KAFKA_SSL_TRUSTSTORE_PASSWORD:-kafka123}
KAFKA_SSL_CLIENT_AUTH: ${KAFKA_SSL_CLIENT_AUTH:-none}
KAFKA_SSL_ENDPOINT_IDENTIFICATION_ALGORITHM: ${KAFKA_SSL_ENDPOINT_IDENTIFICATION_ALGORITHM:-https}
@ -141,8 +139,8 @@ services:
CLICKHOUSE_SECURE: ${CLICKHOUSE_SECURE:-true}
volumes:
- clickhouse-1-data:/var/lib/clickhouse
- ./clickhouse-config:/etc/clickhouse-server/config.d
- ./clickhouse-users:/etc/clickhouse-server/users.d
- ./clickhouse-config:/etc/clickhouse-server/config.d:ro
- ./clickhouse-users:/etc/clickhouse-server/users.d:ro
ports:
- "${CLICKHOUSE_1_PORT:-8123}:8123"
- "${CLICKHOUSE_1_HTTP_PORT:-9000}:9000"
@ -150,8 +148,7 @@ services:
- sensus-network
restart: unless-stopped
healthcheck:
#test: ["CMD", "wget", "--no-verbose", "--tries=1", "--spider", "http://localhost:8123/ping"]
test: ["CMD", "clickhouse-client", "--query", "SELECT 1"]
test: ["CMD", "wget", "--no-verbose", "--tries=1", "--spider", "http://localhost:8123/ping"]
interval: 30s
timeout: 10s
retries: 3
@ -168,8 +165,8 @@ services:
CLICKHOUSE_SECURE: ${CLICKHOUSE_SECURE:-true}
volumes:
- clickhouse-2-data:/var/lib/clickhouse
- ./clickhouse-config:/etc/clickhouse-server/config.d
- ./clickhouse-users:/etc/clickhouse-server/users.d
- ./clickhouse-config:/etc/clickhouse-server/config.d:ro
- ./clickhouse-users:/etc/clickhouse-server/users.d:ro
ports:
- "${CLICKHOUSE_2_PORT:-8124}:8123"
- "${CLICKHOUSE_2_HTTP_PORT:-9001}:9000"
@ -177,8 +174,7 @@ services:
- sensus-network
restart: unless-stopped
healthcheck:
#test: ["CMD", "wget", "--no-verbose", "--tries=1", "--spider", "http://localhost:8123/ping"]
test: ["CMD", "clickhouse-client", "--query", "SELECT 1"]
test: ["CMD", "wget", "--no-verbose", "--tries=1", "--spider", "http://localhost:8123/ping"]
interval: 30s
timeout: 10s
retries: 3

8
env.example
View File

@ -13,7 +13,7 @@ ZOOKEEPER_TICK_TIME=2000
# =============================================================================
KAFKA_BROKER_ID=1
KAFKA_LISTENER_SECURITY_PROTOCOL_MAP=PLAINTEXT:PLAINTEXT,PLAINTEXT_HOST:PLAINTEXT,SSL:SSL
KAFKA_ADVERTISED_LISTENERS=PLAINTEXT://kafka:29092,PLAINTEXT_HOST://10.29.91.4:9092,SSL://10.29.91.4:9093
KAFKA_ADVERTISED_LISTENERS=PLAINTEXT://kafka:29092,PLAINTEXT_HOST://10.99.0.90:9092,SSL://10.99.0.90:9093
KAFKA_EXTERNAL_PORT=9092
KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR=1
KAFKA_TRANSACTION_STATE_LOG_MIN_ISR=1
@ -45,10 +45,8 @@ KAFKA_CLIENT_ID=sensus-worker
# Kafka SSL
KAFKA_SSL_PORT=9093
KAFKA_SSL_KEYSTORE_FILENAME=kafka.server.keystore.jks
KAFKA_SSL_KEYSTORE_PASSWORD=kafka123
KAFKA_SSL_KEY_PASSWORD=kafka123
KAFKA_SSL_TRUSTSTORE_FILENAME=kafka.server.truststore.jks
KAFKA_SSL_TRUSTSTORE_PASSWORD=kafka123
KAFKA_SSL_CLIENT_AUTH=none
KAFKA_SSL_ENDPOINT_IDENTIFICATION_ALGORITHM=https
@ -61,7 +59,7 @@ KAFKA_SSL_ENABLED=false
# =============================================================================
POSTGRES_DB=sensus
POSTGRES_USER=sensus
POSTGRES_PASSWORD=sensus
POSTGRES_PASSWORD=sensus_secure_password_2024
POSTGRES_PORT=5432
# PostgreSQL SSL
@ -76,7 +74,7 @@ POSTGRES_INITDB_ARGS=--encoding=UTF-8 --lc-collate=C --lc-ctype=C
# =============================================================================
CLICKHOUSE_DB=sensus_metrics
CLICKHOUSE_USER=sensus
CLICKHOUSE_PASSWORD=sensus
CLICKHOUSE_PASSWORD=clickhouse_secure_password_2024
CLICKHOUSE_DEFAULT_ACCESS_MANAGEMENT=1
CLICKHOUSE_SECURE=true